mirror of https://github.com/PCSX2/pcsx2.git
Qt: Fix a few warnings on Linux
This commit is contained in:
parent
7b0bde4f1f
commit
37c4c596b5
|
@ -285,6 +285,9 @@ void EmuThread::executeVM()
|
||||||
destroyVM();
|
destroyVM();
|
||||||
m_event_loop->processEvents(QEventLoop::AllEvents);
|
m_event_loop->processEvents(QEventLoop::AllEvents);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
default:
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -241,9 +241,6 @@ void MainWindow::setStyleFromSettings()
|
||||||
// Alternative white theme.
|
// Alternative white theme.
|
||||||
qApp->setStyle(QStyleFactory::create("Fusion"));
|
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 black(25, 25, 25);
|
||||||
const QColor teal(0, 128, 128);
|
const QColor teal(0, 128, 128);
|
||||||
const QColor tameTeal(160, 190, 185);
|
const QColor tameTeal(160, 190, 185);
|
||||||
|
@ -279,18 +276,12 @@ void MainWindow::setStyleFromSettings()
|
||||||
// Alternative light theme.
|
// Alternative light theme.
|
||||||
qApp->setStyle(QStyleFactory::create("Fusion"));
|
qApp->setStyle(QStyleFactory::create("Fusion"));
|
||||||
|
|
||||||
const QColor lighterGray(75, 75, 75);
|
|
||||||
const QColor gray(150, 150, 150);
|
const QColor gray(150, 150, 150);
|
||||||
const QColor black(25, 25, 25);
|
const QColor black(25, 25, 25);
|
||||||
const QColor darkPink(180, 80, 200);
|
|
||||||
const QColor pink(255, 174, 201);
|
const QColor pink(255, 174, 201);
|
||||||
const QColor brightPink(255, 230, 255);
|
const QColor brightPink(255, 230, 255);
|
||||||
const QColor congoPink(255, 127, 121);
|
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 blue(221, 225, 239);
|
||||||
const QColor darkBlue(100, 95, 250);
|
|
||||||
|
|
||||||
QPalette standardPalette;
|
QPalette standardPalette;
|
||||||
standardPalette.setColor(QPalette::Window, pink);
|
standardPalette.setColor(QPalette::Window, pink);
|
||||||
|
@ -322,13 +313,10 @@ void MainWindow::setStyleFromSettings()
|
||||||
// Alternative light theme.
|
// Alternative light theme.
|
||||||
qApp->setStyle(QStyleFactory::create("Fusion"));
|
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 black(25, 25, 25);
|
||||||
const QColor darkBlue(73, 97, 177);
|
const QColor darkBlue(73, 97, 177);
|
||||||
const QColor blue(106, 156, 255);
|
const QColor blue(106, 156, 255);
|
||||||
const QColor lightBlue(130, 155, 241);
|
const QColor lightBlue(130, 155, 241);
|
||||||
const QColor brightBlue(164, 184, 255);
|
|
||||||
|
|
||||||
QPalette standardPalette;
|
QPalette standardPalette;
|
||||||
standardPalette.setColor(QPalette::Window, lightBlue);
|
standardPalette.setColor(QPalette::Window, lightBlue);
|
||||||
|
@ -394,7 +382,6 @@ void MainWindow::setStyleFromSettings()
|
||||||
// adapted from https://gist.github.com/QuantumCD/6245215
|
// adapted from https://gist.github.com/QuantumCD/6245215
|
||||||
qApp->setStyle(QStyleFactory::create("Fusion"));
|
qApp->setStyle(QStyleFactory::create("Fusion"));
|
||||||
|
|
||||||
const QColor lighterGray(75, 75, 75);
|
|
||||||
const QColor darkGray(53, 53, 53);
|
const QColor darkGray(53, 53, 53);
|
||||||
const QColor gray(128, 128, 128);
|
const QColor gray(128, 128, 128);
|
||||||
const QColor black(25, 25, 25);
|
const QColor black(25, 25, 25);
|
||||||
|
@ -431,9 +418,6 @@ void MainWindow::setStyleFromSettings()
|
||||||
// Alternative dark theme.
|
// Alternative dark theme.
|
||||||
qApp->setStyle(QStyleFactory::create("Fusion"));
|
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 darkRed(80, 45, 69);
|
||||||
const QColor purplishRed(120, 45, 69);
|
const QColor purplishRed(120, 45, 69);
|
||||||
const QColor brightRed(200, 45, 69);
|
const QColor brightRed(200, 45, 69);
|
||||||
|
@ -692,7 +676,7 @@ void MainWindow::onGameListEntryContextMenuRequested(const QPoint& point)
|
||||||
QAction* action = menu.addAction(tr("Properties..."));
|
QAction* action = menu.addAction(tr("Properties..."));
|
||||||
action->setEnabled(!entry->serial.empty());
|
action->setEnabled(!entry->serial.empty());
|
||||||
if (action->isEnabled())
|
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..."));
|
action = menu.addAction(tr("Open Containing Directory..."));
|
||||||
connect(action, &QAction::triggered, [this, entry]() {
|
connect(action, &QAction::triggered, [this, entry]() {
|
||||||
|
@ -1461,7 +1445,7 @@ void MainWindow::populateSaveStateMenu(QMenu* menu, const QString& serial, quint
|
||||||
timestamp = tr("Empty");
|
timestamp = tr("Empty");
|
||||||
|
|
||||||
QString title(tr("Save Slot %1 (%2)").arg(i).arg(timestamp));
|
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); });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ private Q_SLOTS:
|
||||||
void recreate();
|
void recreate();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void closeEvent(QCloseEvent* event);
|
void closeEvent(QCloseEvent* event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum : s32
|
enum : s32
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent)
|
AudioSettingsWidget::AudioSettingsWidget(SettingsDialog* dialog, QWidget* parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
SettingsInterface* sif = dialog->getSettingsInterface();
|
// SettingsInterface* sif = dialog->getSettingsInterface();
|
||||||
|
|
||||||
m_ui.setupUi(this);
|
m_ui.setupUi(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,7 +102,7 @@ void GameListSettingsWidget::addPathToTable(const std::string& path, bool recurs
|
||||||
m_ui.searchDirectoryList->setCellWidget(row, 1, cb);
|
m_ui.searchDirectoryList->setCellWidget(row, 1, cb);
|
||||||
cb->setChecked(recursive);
|
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());
|
const std::string path(item->text().toStdString());
|
||||||
if (state == Qt::Checked)
|
if (state == Qt::Checked)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
/* PCSX2 - PS2 Emulator for PCs
|
|
||||||
/* PCSX2 - PS2 Emulator for PCs
|
/* PCSX2 - PS2 Emulator for PCs
|
||||||
* Copyright (C) 2002-2022 PCSX2 Dev Team
|
* Copyright (C) 2002-2022 PCSX2 Dev Team
|
||||||
*
|
*
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsDialog* dialog, QWidget* parent)
|
MemoryCardSettingsWidget::MemoryCardSettingsWidget(SettingsDialog* dialog, QWidget* parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
SettingsInterface* sif = dialog->getSettingsInterface();
|
// SettingsInterface* sif = dialog->getSettingsInterface();
|
||||||
|
|
||||||
m_ui.setupUi(this);
|
m_ui.setupUi(this);
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,7 @@ private Q_SLOTS:
|
||||||
void onRestoreDefaultsClicked();
|
void onRestoreDefaultsClicked();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void closeEvent(QCloseEvent*);
|
void closeEvent(QCloseEvent*) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum : u32
|
enum : u32
|
||||||
|
|
|
@ -37,7 +37,7 @@ SystemSettingsWidget::SystemSettingsWidget(SettingsDialog* dialog, QWidget* pare
|
||||||
|
|
||||||
m_ui.setupUi(this);
|
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.MTVU, "EmuCore/Speedhacks", "vuThread", false);
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.instantVU1, "EmuCore/Speedhacks", "vu1Instant", true);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.instantVU1, "EmuCore/Speedhacks", "vu1Instant", true);
|
||||||
|
|
Loading…
Reference in New Issue