summaryrefslogtreecommitdiff
path: root/utils/rbutilqt/gui/selectiveinstallwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'utils/rbutilqt/gui/selectiveinstallwidget.cpp')
-rw-r--r--utils/rbutilqt/gui/selectiveinstallwidget.cpp24
1 files changed, 12 insertions, 12 deletions
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 {