From 1ad4faa33403dc24ddc6f907f2b56bbe968d77f2 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 26 Dec 2021 19:50:19 +0100 Subject: rbutil: Modernize connect() calls. Auto fixed by clazy. Change-Id: Iea16d892fd81c151f0081f7476acc5eda62afc25 --- utils/rbutilqt/gui/selectiveinstallwidget.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'utils/rbutilqt/gui/selectiveinstallwidget.cpp') 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) // the bootloader install class does NOT use any GUI stuff. // All messages are passed via signals. - connect(bl, SIGNAL(done(bool)), m_logger, SLOT(setFinished())); + connect(bl, &BootloaderInstallBase::done, m_logger, &ProgressLoggerGui::setFinished); connect(bl, &BootloaderInstallBase::done, this, &SelectiveInstallWidget::continueInstall); - connect(bl, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); + connect(bl, &BootloaderInstallBase::logItem, m_logger, &ProgressLoggerGui::addItem); connect(bl, &BootloaderInstallBase::logProgress, m_logger, &ProgressLoggerGui::setProgress); // pass Abort button click signal to current installer connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); @@ -447,9 +447,9 @@ void SelectiveInstallWidget::installRockbox(void) connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); - connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); + connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); - connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); + connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); m_zipinstaller->install(); } @@ -488,9 +488,9 @@ void SelectiveInstallWidget::installFonts(void) m_zipinstaller->setCache(true); connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); - connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); + connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); - connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); + connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); m_zipinstaller->install(); } else { @@ -527,9 +527,9 @@ void SelectiveInstallWidget::installVoicefile(void) m_zipinstaller->setCache(true); connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); - connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); + connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); - connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); + connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); m_zipinstaller->install(); } else { @@ -572,9 +572,9 @@ void SelectiveInstallWidget::installManual(void) m_zipinstaller->setUnzip(mantype == "html"); connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); - connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); + connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); - connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); + connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); m_zipinstaller->install(); } else { @@ -667,9 +667,9 @@ void SelectiveInstallWidget::installPluginData(void) if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) m_zipinstaller->setCache(true); connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); - connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); + connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem); connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); - connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); + connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort); m_zipinstaller->install(); } else { -- cgit v1.2.3