jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 16:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Refactor files in oracle to new Qt Slot/Signal syntax (#5869)

Browse source 
* Refactor files in oracle to new Qt Slot/Signal syntax

* fix build failure
This commit is contained in:
RickyRister 2025-04-20 20:53:37 -07:00 • committed by GitHub
parent a1499854f9
commit ca73033aea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
oracle/src/oraclewizard.cpp
View file

@ -58,7 +58,7 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
QString dummy = QT_TRANSLATE_NOOP("i18n", "English"); QString dummy = QT_TRANSLATE_NOOP("i18n", "English");
settings = new QSettings(SettingsCache::instance().getSettingsPath() + "global.ini", QSettings::IniFormat, this); settings = new QSettings(SettingsCache::instance().getSettingsPath() + "global.ini", QSettings::IniFormat, this);
connect(&SettingsCache::instance(), SIGNAL(langChanged()), this, SLOT(updateLanguage())); connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &OracleWizard::updateLanguage);
importer = new OracleImporter(SettingsCache::instance().getDataPath(), this); importer = new OracleImporter(SettingsCache::instance().getDataPath(), this);
@ -158,7 +158,7 @@ IntroPage::IntroPage(QWidget *parent) : OracleWizardPage(parent)
languageBox->setCurrentIndex(index); languageBox->setCurrentIndex(index);
} }
connect(languageBox, SIGNAL(currentIndexChanged(int)), this, SLOT(languageBoxChanged(int))); connect(languageBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &IntroPage::languageBoxChanged);
auto *layout = new QGridLayout(this); auto *layout = new QGridLayout(this);
layout->addWidget(label, 0, 0, 1, 2); layout->addWidget(label, 0, 0, 1, 2);
@ -226,10 +226,10 @@ LoadSetsPage::LoadSetsPage(QWidget *parent) : OracleWizardPage(parent)
urlRadioButton->setChecked(true); urlRadioButton->setChecked(true);
urlButton = new QPushButton(this); urlButton = new QPushButton(this);
connect(urlButton, SIGNAL(clicked()), this, SLOT(actRestoreDefaultUrl())); connect(urlButton, &QPushButton::clicked, this, &LoadSetsPage::actRestoreDefaultUrl);
fileButton = new QPushButton(this); fileButton = new QPushButton(this);
connect(fileButton, SIGNAL(clicked()), this, SLOT(actLoadSetsFile())); connect(fileButton, &QPushButton::clicked, this, &LoadSetsPage::actLoadSetsFile);
auto *layout = new QGridLayout(this); auto *layout = new QGridLayout(this);
layout->addWidget(urlRadioButton, 0, 0); layout->addWidget(urlRadioButton, 0, 0);
@ -241,7 +241,7 @@ LoadSetsPage::LoadSetsPage(QWidget *parent) : OracleWizardPage(parent)
layout->addWidget(progressLabel, 4, 0); layout->addWidget(progressLabel, 4, 0);
layout->addWidget(progressBar, 4, 1); layout->addWidget(progressBar, 4, 1);
connect(&watcher, SIGNAL(finished()), this, SLOT(importFinished())); connect(&watcher, &QFutureWatcher<bool>::finished, this, &LoadSetsPage::importFinished);
setLayout(layout); setLayout(layout);
} }
@ -387,8 +387,8 @@ void LoadSetsPage::downloadSetsFile(const QUrl &url)
auto *reply = wizard()->nam->get(QNetworkRequest(url)); auto *reply = wizard()->nam->get(QNetworkRequest(url));
connect(reply, SIGNAL(finished()), this, SLOT(actDownloadFinishedSetsFile())); connect(reply, &QNetworkReply::finished, this, &LoadSetsPage::actDownloadFinishedSetsFile);
connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(actDownloadProgressSetsFile(qint64, qint64))); connect(reply, &QNetworkReply::downloadProgress, this, &LoadSetsPage::actDownloadProgressSetsFile);
} }
void LoadSetsPage::actDownloadProgressSetsFile(qint64 received, qint64 total) void LoadSetsPage::actDownloadProgressSetsFile(qint64 received, qint64 total)
@ -598,7 +598,7 @@ SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent)
void SaveSetsPage::cleanupPage() void SaveSetsPage::cleanupPage()
{ {
wizard()->importer->clear(); wizard()->importer->clear();
disconnect(wizard()->importer, SIGNAL(setIndexChanged(int, int, const QString &)), nullptr, nullptr); disconnect(wizard()->importer, &OracleImporter::setIndexChanged, nullptr, nullptr);
} }
void SaveSetsPage::initializePage() void SaveSetsPage::initializePage()
@ -611,8 +611,7 @@ void SaveSetsPage::initializePage()
return; return;
} }
messageLog->show(); messageLog->show();
connect(wizard()->importer, SIGNAL(setIndexChanged(int, int, const QString &)), this, connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress);
SLOT(updateTotalProgress(int, int, const QString &)));
if (!wizard()->importer->startImport()) { if (!wizard()->importer->startImport()) {
QMessageBox::critical(this, tr("Error"), tr("No set has been imported.")); QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));

6
oracle/src/pagetemplates.cpp
View file

@ -23,7 +23,7 @@ SimpleDownloadFilePage::SimpleDownloadFilePage(QWidget *parent) : OracleWizardPa
progressBar = new QProgressBar(this); progressBar = new QProgressBar(this);
urlButton = new QPushButton(this); urlButton = new QPushButton(this);
connect(urlButton, SIGNAL(clicked()), this, SLOT(actRestoreDefaultUrl())); connect(urlButton, &QPushButton::clicked, this, &SimpleDownloadFilePage::actRestoreDefaultUrl);
defaultPathCheckBox = new QCheckBox(this); defaultPathCheckBox = new QCheckBox(this);
@ -91,8 +91,8 @@ void SimpleDownloadFilePage::downloadFile(QUrl url)
{ {
QNetworkReply *reply = wizard()->nam->get(QNetworkRequest(url)); QNetworkReply *reply = wizard()->nam->get(QNetworkRequest(url));
connect(reply, SIGNAL(finished()), this, SLOT(actDownloadFinished())); connect(reply, &QNetworkReply::finished, this, &SimpleDownloadFilePage::actDownloadFinished);
connect(reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(actDownloadProgress(qint64, qint64))); connect(reply, &QNetworkReply::downloadProgress, this, &SimpleDownloadFilePage::actDownloadProgress);
} }
void SimpleDownloadFilePage::actDownloadProgress(qint64 received, qint64 total) void SimpleDownloadFilePage::actDownloadProgress(qint64 received, qint64 total)