diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-26 19:50:19 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-26 19:50:19 +0100 |
commit | 1ad4faa33403dc24ddc6f907f2b56bbe968d77f2 (patch) | |
tree | aa6045052e1d338d28c25b8e5e2b3ad8ac116b4f /utils/rbutilqt/gui | |
parent | 9f3d6e47e7bc7d3acf43a5ff86d3a82bbd4ad0a4 (diff) | |
download | rockbox-1ad4faa33403dc24ddc6f907f2b56bbe968d77f2.tar.gz rockbox-1ad4faa33403dc24ddc6f907f2b56bbe968d77f2.zip |
rbutil: Modernize connect() calls.
Auto fixed by clazy.
Change-Id: Iea16d892fd81c151f0081f7476acc5eda62afc25
Diffstat (limited to 'utils/rbutilqt/gui')
-rw-r--r-- | utils/rbutilqt/gui/backupdialog.cpp | 5 | ||||
-rw-r--r-- | utils/rbutilqt/gui/changelog.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/gui/selectiveinstallwidget.cpp | 24 |
3 files changed, 15 insertions, 16 deletions
diff --git a/utils/rbutilqt/gui/backupdialog.cpp b/utils/rbutilqt/gui/backupdialog.cpp index 63e628f7cf..e48d0babae 100644 --- a/utils/rbutilqt/gui/backupdialog.cpp +++ b/utils/rbutilqt/gui/backupdialog.cpp | |||
@@ -60,7 +60,6 @@ BackupDialog::BackupDialog(QWidget* parent) : QDialog(parent) | |||
60 | 60 | ||
61 | m_thread = new BackupSizeThread(); | 61 | m_thread = new BackupSizeThread(); |
62 | connect(m_thread, &QThread::finished, this, &BackupDialog::updateSizeInfo); | 62 | connect(m_thread, &QThread::finished, this, &BackupDialog::updateSizeInfo); |
63 | connect(m_thread, SIGNAL(terminated()), this, SLOT(updateSizeInfo())); | ||
64 | 63 | ||
65 | connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close); | 64 | connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close); |
66 | connect(ui.buttonCancel, &QAbstractButton::clicked, m_thread, &QThread::quit); | 65 | connect(ui.buttonCancel, &QAbstractButton::clicked, m_thread, &QThread::quit); |
@@ -135,8 +134,8 @@ void BackupDialog::backup(void) | |||
135 | 134 | ||
136 | // create backup | 135 | // create backup |
137 | ZipUtil zip(this); | 136 | ZipUtil zip(this); |
138 | connect(&zip, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int))); | 137 | connect(&zip, &ZipUtil::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
139 | connect(&zip, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 138 | connect(&zip, &ZipUtil::logItem, m_logger, &ProgressLoggerGui::addItem); |
140 | zip.open(m_backupName, QuaZip::mdCreate); | 139 | zip.open(m_backupName, QuaZip::mdCreate); |
141 | 140 | ||
142 | QString mp = m_mountpoint + "/.rockbox"; | 141 | QString mp = m_mountpoint + "/.rockbox"; |
diff --git a/utils/rbutilqt/gui/changelog.cpp b/utils/rbutilqt/gui/changelog.cpp index 6495c0ebd9..f256f3805c 100644 --- a/utils/rbutilqt/gui/changelog.cpp +++ b/utils/rbutilqt/gui/changelog.cpp | |||
@@ -28,7 +28,7 @@ Changelog::Changelog(QWidget *parent) : QDialog(parent) | |||
28 | ui.browserChangelog->setHtml(parseChangelogFile(":/docs/changelog.txt")); | 28 | ui.browserChangelog->setHtml(parseChangelogFile(":/docs/changelog.txt")); |
29 | ui.browserChangelog->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); | 29 | ui.browserChangelog->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor); |
30 | ui.checkBoxShowAlways->setChecked(RbSettings::value(RbSettings::ShowChangelog).toBool()); | 30 | ui.checkBoxShowAlways->setChecked(RbSettings::value(RbSettings::ShowChangelog).toBool()); |
31 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); | 31 | connect(ui.buttonOk, &QAbstractButton::clicked, this, &Changelog::accept); |
32 | } | 32 | } |
33 | 33 | ||
34 | 34 | ||
diff --git a/utils/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp index 341a4072cc..a558015ded 100644 --- a/utils/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -292,9 +292,9 @@ void SelectiveInstallWidget::installBootloader(void) | |||
292 | 292 | ||
293 | // the bootloader install class does NOT use any GUI stuff. | 293 | // the bootloader install class does NOT use any GUI stuff. |
294 | // All messages are passed via signals. | 294 | // All messages are passed via signals. |
295 | connect(bl, SIGNAL(done(bool)), m_logger, SLOT(setFinished())); | 295 | connect(bl, &BootloaderInstallBase::done, m_logger, &ProgressLoggerGui::setFinished); |
296 | connect(bl, &BootloaderInstallBase::done, this, &SelectiveInstallWidget::continueInstall); | 296 | connect(bl, &BootloaderInstallBase::done, this, &SelectiveInstallWidget::continueInstall); |
297 | connect(bl, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 297 | connect(bl, &BootloaderInstallBase::logItem, m_logger, &ProgressLoggerGui::addItem); |
298 | connect(bl, &BootloaderInstallBase::logProgress, m_logger, &ProgressLoggerGui::setProgress); | 298 | connect(bl, &BootloaderInstallBase::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
299 | // pass Abort button click signal to current installer | 299 | // pass Abort button click signal to current installer |
300 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); | 300 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); |
@@ -447,9 +447,9 @@ void SelectiveInstallWidget::installRockbox(void) | |||
447 | 447 | ||
448 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); | 448 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
449 | 449 | ||
450 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 450 | connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); |
451 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); | 451 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
452 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 452 | connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); |
453 | m_zipinstaller->install(); | 453 | m_zipinstaller->install(); |
454 | 454 | ||
455 | } | 455 | } |
@@ -488,9 +488,9 @@ void SelectiveInstallWidget::installFonts(void) | |||
488 | m_zipinstaller->setCache(true); | 488 | m_zipinstaller->setCache(true); |
489 | 489 | ||
490 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); | 490 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
491 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 491 | connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); |
492 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); | 492 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
493 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 493 | connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); |
494 | m_zipinstaller->install(); | 494 | m_zipinstaller->install(); |
495 | } | 495 | } |
496 | else { | 496 | else { |
@@ -527,9 +527,9 @@ void SelectiveInstallWidget::installVoicefile(void) | |||
527 | m_zipinstaller->setCache(true); | 527 | m_zipinstaller->setCache(true); |
528 | 528 | ||
529 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); | 529 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
530 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 530 | connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); |
531 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); | 531 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
532 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 532 | connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); |
533 | m_zipinstaller->install(); | 533 | m_zipinstaller->install(); |
534 | } | 534 | } |
535 | else { | 535 | else { |
@@ -572,9 +572,9 @@ void SelectiveInstallWidget::installManual(void) | |||
572 | m_zipinstaller->setUnzip(mantype == "html"); | 572 | m_zipinstaller->setUnzip(mantype == "html"); |
573 | 573 | ||
574 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); | 574 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
575 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 575 | connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); |
576 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); | 576 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
577 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 577 | connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); |
578 | m_zipinstaller->install(); | 578 | m_zipinstaller->install(); |
579 | } | 579 | } |
580 | else { | 580 | else { |
@@ -667,9 +667,9 @@ void SelectiveInstallWidget::installPluginData(void) | |||
667 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) | 667 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) |
668 | m_zipinstaller->setCache(true); | 668 | m_zipinstaller->setCache(true); |
669 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); | 669 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
670 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 670 | connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); |
671 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); | 671 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
672 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 672 | connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); |
673 | m_zipinstaller->install(); | 673 | m_zipinstaller->install(); |
674 | } | 674 | } |
675 | else { | 675 | else { |