ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix a few warnings on Linux

This commit is contained in:
Connor McLaughlin 2022-03-04 18:04:05 +10:00 committed by refractionpcsx2
parent 7b0bde4f1f
commit 37c4c596b5
9 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2-qt/EmuThread.cpp
View File

@ -285,6 +285,9 @@ void EmuThread::executeVM()
destroyVM();
m_event_loop->processEvents(QEventLoop::AllEvents);
return;
default:
continue;
}
}
}

20
pcsx2-qt/MainWindow.cpp
View File

@ -241,9 +241,6 @@ void MainWindow::setStyleFromSettings()
// Alternative white theme.
qApp->setStyle(QStyleFactory::create("Fusion"));
const QColor lighterGray(75, 75, 75);
const QColor darkGray(53, 53, 53);
const QColor gray(128, 128, 128);
const QColor black(25, 25, 25);
const QColor teal(0, 128, 128);
const QColor tameTeal(160, 190, 185);
@ -279,18 +276,12 @@ void MainWindow::setStyleFromSettings()
// Alternative light theme.
qApp->setStyle(QStyleFactory::create("Fusion"));
const QColor lighterGray(75, 75, 75);
const QColor gray(150, 150, 150);
const QColor black(25, 25, 25);
const QColor darkPink(180, 80, 200);
const QColor pink(255, 174, 201);
const QColor brightPink(255, 230, 255);
const QColor congoPink(255, 127, 121);
const QColor yellow(255, 235, 180);
const QColor darkGreen(161, 240, 183);
const QColor green(221, 239, 226);
const QColor blue(221, 225, 239);
const QColor darkBlue(100, 95, 250);
QPalette standardPalette;
standardPalette.setColor(QPalette::Window, pink);
@ -322,13 +313,10 @@ void MainWindow::setStyleFromSettings()
// Alternative light theme.
qApp->setStyle(QStyleFactory::create("Fusion"));
const QColor lighterGray(75, 75, 75);
const QColor gray(128, 128, 128);
const QColor black(25, 25, 25);
const QColor darkBlue(73, 97, 177);
const QColor blue(106, 156, 255);
const QColor lightBlue(130, 155, 241);
const QColor brightBlue(164, 184, 255);
QPalette standardPalette;
standardPalette.setColor(QPalette::Window, lightBlue);
@ -394,7 +382,6 @@ void MainWindow::setStyleFromSettings()
// adapted from https://gist.github.com/QuantumCD/6245215
qApp->setStyle(QStyleFactory::create("Fusion"));
const QColor lighterGray(75, 75, 75);
const QColor darkGray(53, 53, 53);
const QColor gray(128, 128, 128);
const QColor black(25, 25, 25);
@ -431,9 +418,6 @@ void MainWindow::setStyleFromSettings()
// Alternative dark theme.
qApp->setStyle(QStyleFactory::create("Fusion"));
const QColor lighterGray(75, 75, 75);
const QColor gray(128, 128, 128);
const QColor black(25, 25, 25);
const QColor darkRed(80, 45, 69);
const QColor purplishRed(120, 45, 69);
const QColor brightRed(200, 45, 69);
@ -692,7 +676,7 @@ void MainWindow::onGameListEntryContextMenuRequested(const QPoint& point)
QAction* action = menu.addAction(tr("Properties..."));
action->setEnabled(!entry->serial.empty());
if (action->isEnabled())
connect(action, &QAction::triggered, [this, entry]() { SettingsDialog::openGamePropertiesDialog(entry, entry->crc); });
connect(action, &QAction::triggered, [entry]() { SettingsDialog::openGamePropertiesDialog(entry, entry->crc); });
action = menu.addAction(tr("Open Containing Directory..."));
connect(action, &QAction::triggered, [this, entry]() {
@ -1461,7 +1445,7 @@ void MainWindow::populateSaveStateMenu(QMenu* menu, const QString& serial, quint
timestamp = tr("Empty");
QString title(tr("Save Slot %1 (%2)").arg(i).arg(timestamp));
connect(menu->addAction(title), &QAction::triggered, [this, i]() { g_emu_thread->saveStateToSlot(i); });
connect(menu->addAction(title), &QAction::triggered, [i]() { g_emu_thread->saveStateToSlot(i); });
}
}

2
pcsx2-qt/MainWindow.h
View File

@ -104,7 +104,7 @@ private Q_SLOTS:
void recreate();
protected:
void closeEvent(QCloseEvent* event);
void closeEvent(QCloseEvent* event) override;
private:
enum : s32

2
pcsx2-qt/Settings/AudioSettingsWidget.cpp
View File

@ -27,7 +27,7 @@
AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent)
: QWidget(parent)
{
SettingsInterface* sif = dialog->getSettingsInterface();
// SettingsInterface* sif = dialog->getSettingsInterface();
m_ui.setupUi(this);
}

2
pcsx2-qt/Settings/GameListSettingsWidget.cpp
View File

@ -102,7 +102,7 @@ void GameListSettingsWidget::addPathToTable(const std::string& path, bool recurs
m_ui.searchDirectoryList->setCellWidget(row, 1, cb);
cb->setChecked(recursive);
connect(cb, &QCheckBox::stateChanged, [this, item](int state) {
connect(cb, &QCheckBox::stateChanged, [item](int state) {
const std::string path(item->text().toStdString());
if (state == Qt::Checked)
{

1
pcsx2-qt/Settings/InputBindingWidget.cpp
View File

@ -1,4 +1,3 @@
/* PCSX2 - PS2 Emulator for PCs
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2022 PCSX2 Dev Team
*

2
pcsx2-qt/Settings/MemoryCardSettingsWidget.cpp
View File

@ -27,7 +27,7 @@
MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsDialog* dialog, QWidget* parent)
: QWidget(parent)
{
SettingsInterface* sif = dialog->getSettingsInterface();
// SettingsInterface* sif = dialog->getSettingsInterface();
m_ui.setupUi(this);
}

2
pcsx2-qt/Settings/SettingsDialog.h
View File

@ -93,7 +93,7 @@ private Q_SLOTS:
void onRestoreDefaultsClicked();
protected:
void closeEvent(QCloseEvent*);
void closeEvent(QCloseEvent*) override;
private:
enum : u32

2
pcsx2-qt/Settings/SystemSettingsWidget.cpp
View File

@ -37,7 +37,7 @@ SystemSettingsWidget::SystemSettingsWidget(SettingsDialog* dialog, QWidget* pare
m_ui.setupUi(this);
SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.eeCycleSkipping, "EmuCore/Speedhacks", "EECycleSkip", 0);
SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.eeCycleSkipping, "EmuCore/Speedhacks", "EECycleSkip", DEFAULT_EE_CYCLE_SKIP);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.MTVU, "EmuCore/Speedhacks", "vuThread", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.instantVU1, "EmuCore/Speedhacks", "vu1Instant", true);