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 | |
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')
-rw-r--r-- | utils/rbutilqt/configure.cpp | 2 | ||||
-rw-r--r-- | utils/rbutilqt/createvoicewindow.cpp | 6 | ||||
-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 | ||||
-rw-r--r-- | utils/rbutilqt/installtalkwindow.cpp | 6 | ||||
-rw-r--r-- | utils/rbutilqt/rbutilqt.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.cpp | 14 | ||||
-rw-r--r-- | utils/rbutilqt/uninstallwindow.cpp | 4 |
9 files changed, 33 insertions, 34 deletions
diff --git a/utils/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp index 6f64a007a9..169499800e 100644 --- a/utils/rbutilqt/configure.cpp +++ b/utils/rbutilqt/configure.cpp | |||
@@ -94,7 +94,7 @@ Config::Config(QWidget *parent,int index) : QDialog(parent) | |||
94 | 94 | ||
95 | this->setModal(true); | 95 | this->setModal(true); |
96 | 96 | ||
97 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); | 97 | connect(ui.buttonOk, &QAbstractButton::clicked, this, &Config::accept); |
98 | connect(ui.buttonCancel, &QAbstractButton::clicked, this, &Config::abort); | 98 | connect(ui.buttonCancel, &QAbstractButton::clicked, this, &Config::abort); |
99 | connect(ui.radioNoProxy, &QAbstractButton::toggled, this, &Config::setNoProxy); | 99 | connect(ui.radioNoProxy, &QAbstractButton::toggled, this, &Config::setNoProxy); |
100 | connect(ui.radioSystemProxy, &QAbstractButton::toggled, this, &Config::setSystemProxy); | 100 | connect(ui.radioSystemProxy, &QAbstractButton::toggled, this, &Config::setSystemProxy); |
diff --git a/utils/rbutilqt/createvoicewindow.cpp b/utils/rbutilqt/createvoicewindow.cpp index 36131cb537..703f1e774c 100644 --- a/utils/rbutilqt/createvoicewindow.cpp +++ b/utils/rbutilqt/createvoicewindow.cpp | |||
@@ -58,10 +58,10 @@ void CreateVoiceWindow::accept() | |||
58 | voicecreator->setWavtrimThreshold(ui.wavtrimthreshold->value()); | 58 | voicecreator->setWavtrimThreshold(ui.wavtrimthreshold->value()); |
59 | 59 | ||
60 | //start creating | 60 | //start creating |
61 | connect(voicecreator, SIGNAL(done(bool)), logger, SLOT(setFinished())); | 61 | connect(voicecreator, &VoiceFileCreator::done, logger, &ProgressLoggerGui::setFinished); |
62 | connect(voicecreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 62 | connect(voicecreator, &VoiceFileCreator::logItem, logger, &ProgressLoggerGui::addItem); |
63 | connect(voicecreator, &VoiceFileCreator::logProgress, logger, &ProgressLoggerGui::setProgress); | 63 | connect(voicecreator, &VoiceFileCreator::logProgress, logger, &ProgressLoggerGui::setProgress); |
64 | connect(logger,SIGNAL(aborted()),voicecreator,SLOT(abort())); | 64 | connect(logger,&ProgressLoggerGui::aborted,voicecreator,&VoiceFileCreator::abort); |
65 | voicecreator->createVoiceFile(); | 65 | voicecreator->createVoiceFile(); |
66 | } | 66 | } |
67 | 67 | ||
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 { |
diff --git a/utils/rbutilqt/installtalkwindow.cpp b/utils/rbutilqt/installtalkwindow.cpp index bf374decb5..a3570196f5 100644 --- a/utils/rbutilqt/installtalkwindow.cpp +++ b/utils/rbutilqt/installtalkwindow.cpp | |||
@@ -116,10 +116,10 @@ void InstallTalkWindow::accept() | |||
116 | talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", QString::SkipEmptyParts)); | 116 | talkcreator->setIgnoreFiles(ui.ignoreFiles->text().split(",", QString::SkipEmptyParts)); |
117 | #endif | 117 | #endif |
118 | 118 | ||
119 | connect(talkcreator, SIGNAL(done(bool)), logger, SLOT(setFinished())); | 119 | connect(talkcreator, &TalkFileCreator::done, logger, &ProgressLoggerGui::setFinished); |
120 | connect(talkcreator, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 120 | connect(talkcreator, &TalkFileCreator::logItem, logger, &ProgressLoggerGui::addItem); |
121 | connect(talkcreator, &TalkFileCreator::logProgress, logger, &ProgressLoggerGui::setProgress); | 121 | connect(talkcreator, &TalkFileCreator::logProgress, logger, &ProgressLoggerGui::setProgress); |
122 | connect(logger,SIGNAL(aborted()),talkcreator,SLOT(abort())); | 122 | connect(logger,&ProgressLoggerGui::aborted,talkcreator,&TalkFileCreator::abort); |
123 | 123 | ||
124 | for(int i = 0; i < foldersToTalk.size(); i++) { | 124 | for(int i = 0; i < foldersToTalk.size(); i++) { |
125 | LOG_INFO() << "creating talk files for folder" | 125 | LOG_INFO() << "creating talk files for folder" |
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp index 7c11f44806..a9878646da 100644 --- a/utils/rbutilqt/rbutilqt.cpp +++ b/utils/rbutilqt/rbutilqt.cpp | |||
@@ -497,9 +497,9 @@ void RbUtilQt::uninstallBootloader(void) | |||
497 | return; | 497 | return; |
498 | } | 498 | } |
499 | 499 | ||
500 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 500 | connect(bl, &BootloaderInstallBase::logItem, logger, &ProgressLoggerGui::addItem); |
501 | connect(bl, &BootloaderInstallBase::logProgress, logger, &ProgressLoggerGui::setProgress); | 501 | connect(bl, &BootloaderInstallBase::logProgress, logger, &ProgressLoggerGui::setProgress); |
502 | connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); | 502 | connect(bl, &BootloaderInstallBase::done, logger, &ProgressLoggerGui::setFinished); |
503 | // pass Abort button click signal to current installer | 503 | // pass Abort button click signal to current installer |
504 | connect(logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); | 504 | connect(logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); |
505 | 505 | ||
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp index 358bd7f1a1..129df8a980 100644 --- a/utils/rbutilqt/themesinstallwindow.cpp +++ b/utils/rbutilqt/themesinstallwindow.cpp | |||
@@ -95,7 +95,7 @@ void ThemesInstallWindow::downloadInfo() | |||
95 | getter->setFile(&themesInfo); | 95 | getter->setFile(&themesInfo); |
96 | 96 | ||
97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
98 | connect(logger, SIGNAL(aborted()), getter, SLOT(abort())); | 98 | connect(logger, &ProgressLoggerGui::aborted, getter, &HttpGet::abort); |
99 | getter->getFile(url); | 99 | getter->getFile(url); |
100 | } | 100 | } |
101 | 101 | ||
@@ -111,8 +111,8 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
111 | { | 111 | { |
112 | LOG_INFO() << "Download done, error:" << error; | 112 | LOG_INFO() << "Download done, error:" << error; |
113 | 113 | ||
114 | disconnect(logger, SIGNAL(aborted()), getter, SLOT(abort())); | 114 | disconnect(logger, &ProgressLoggerGui::aborted, getter, &HttpGet::abort); |
115 | disconnect(logger, SIGNAL(aborted()), this, SLOT(close())); | 115 | disconnect(logger, &ProgressLoggerGui::aborted, this, &QWidget::close); |
116 | themesInfo.open(); | 116 | themesInfo.open(); |
117 | 117 | ||
118 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); | 118 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); |
@@ -299,7 +299,7 @@ void ThemesInstallWindow::show() | |||
299 | logger->show(); | 299 | logger->show(); |
300 | logger->addItem(tr("getting themes information ..."), LOGINFO); | 300 | logger->addItem(tr("getting themes information ..."), LOGINFO); |
301 | 301 | ||
302 | connect(logger, SIGNAL(aborted()), this, SLOT(close())); | 302 | connect(logger, &ProgressLoggerGui::aborted, this, &QWidget::close); |
303 | 303 | ||
304 | downloadInfo(); | 304 | downloadInfo(); |
305 | } | 305 | } |
@@ -372,12 +372,12 @@ void ThemesInstallWindow::install() | |||
372 | 372 | ||
373 | if(!windowSelectOnly) { | 373 | if(!windowSelectOnly) { |
374 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); | 374 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); |
375 | connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); | 375 | connect(installer, &ZipInstaller::done, logger, &ProgressLoggerGui::setFinished); |
376 | } | 376 | } |
377 | connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 377 | connect(installer, &ZipInstaller::logItem, logger, &ProgressLoggerGui::addItem); |
378 | connect(installer, &ZipInstaller::logProgress, logger, &ProgressLoggerGui::setProgress); | 378 | connect(installer, &ZipInstaller::logProgress, logger, &ProgressLoggerGui::setProgress); |
379 | connect(installer, SIGNAL(done(bool)), this, SIGNAL(done(bool))); | 379 | connect(installer, SIGNAL(done(bool)), this, SIGNAL(done(bool))); |
380 | connect(logger, SIGNAL(aborted()), installer, SLOT(abort())); | 380 | connect(logger, &ProgressLoggerGui::aborted, installer, &ZipInstaller::abort); |
381 | installer->install(); | 381 | installer->install(); |
382 | } | 382 | } |
383 | 383 | ||
diff --git a/utils/rbutilqt/uninstallwindow.cpp b/utils/rbutilqt/uninstallwindow.cpp index bbce88ffc2..c0c9de4c89 100644 --- a/utils/rbutilqt/uninstallwindow.cpp +++ b/utils/rbutilqt/uninstallwindow.cpp | |||
@@ -31,9 +31,9 @@ UninstallWindow::UninstallWindow(QWidget *parent) : QDialog(parent) | |||
31 | 31 | ||
32 | uninstaller = new Uninstaller(this,mountpoint); | 32 | uninstaller = new Uninstaller(this,mountpoint); |
33 | logger = new ProgressLoggerGui(this); | 33 | logger = new ProgressLoggerGui(this); |
34 | connect(uninstaller, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 34 | connect(uninstaller, &Uninstaller::logItem, logger, &ProgressLoggerGui::addItem); |
35 | connect(uninstaller, &Uninstaller::logProgress, logger, &ProgressLoggerGui::setProgress); | 35 | connect(uninstaller, &Uninstaller::logProgress, logger, &ProgressLoggerGui::setProgress); |
36 | connect(uninstaller, SIGNAL(logFinished(void)), logger, SLOT(setFinished(void))); | 36 | connect(uninstaller, &Uninstaller::logFinished, logger, &ProgressLoggerGui::setFinished); |
37 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); | 37 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); |
38 | 38 | ||
39 | // disable smart uninstall, if not possible | 39 | // disable smart uninstall, if not possible |