diff options
Diffstat (limited to 'utils/rbutilqt/gui/selectiveinstallwidget.cpp')
-rw-r--r-- | utils/rbutilqt/gui/selectiveinstallwidget.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/utils/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp index a0504c0f40..3fe2dc7956 100644 --- a/utils/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -294,9 +294,9 @@ void SelectiveInstallWidget::installBootloader(void) | |||
294 | // the bootloader install class does NOT use any GUI stuff. | 294 | // the bootloader install class does NOT use any GUI stuff. |
295 | // All messages are passed via signals. | 295 | // All messages are passed via signals. |
296 | connect(bl, SIGNAL(done(bool)), m_logger, SLOT(setFinished())); | 296 | connect(bl, SIGNAL(done(bool)), m_logger, SLOT(setFinished())); |
297 | connect(bl, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 297 | connect(bl, &BootloaderInstallBase::done, this, &SelectiveInstallWidget::continueInstall); |
298 | connect(bl, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 298 | connect(bl, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); |
299 | connect(bl, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int))); | 299 | connect(bl, &BootloaderInstallBase::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
300 | // pass Abort button click signal to current installer | 300 | // pass Abort button click signal to current installer |
301 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); | 301 | connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); |
302 | 302 | ||
@@ -446,10 +446,10 @@ void SelectiveInstallWidget::installRockbox(void) | |||
446 | PlayerBuildInfo::BuildVersion, m_buildtype).toString()); | 446 | PlayerBuildInfo::BuildVersion, m_buildtype).toString()); |
447 | m_zipinstaller->setMountPoint(m_mountpoint); | 447 | m_zipinstaller->setMountPoint(m_mountpoint); |
448 | 448 | ||
449 | connect(m_zipinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 449 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
450 | 450 | ||
451 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 451 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); |
452 | connect(m_zipinstaller, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int))); | 452 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
453 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 453 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); |
454 | m_zipinstaller->install(); | 454 | m_zipinstaller->install(); |
455 | 455 | ||
@@ -488,9 +488,9 @@ void SelectiveInstallWidget::installFonts(void) | |||
488 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) | 488 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) |
489 | m_zipinstaller->setCache(true); | 489 | m_zipinstaller->setCache(true); |
490 | 490 | ||
491 | connect(m_zipinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 491 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
492 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 492 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); |
493 | connect(m_zipinstaller, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int))); | 493 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
494 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 494 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); |
495 | m_zipinstaller->install(); | 495 | m_zipinstaller->install(); |
496 | } | 496 | } |
@@ -528,9 +528,9 @@ void SelectiveInstallWidget::installVoicefile(void) | |||
528 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) | 528 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) |
529 | m_zipinstaller->setCache(true); | 529 | m_zipinstaller->setCache(true); |
530 | 530 | ||
531 | connect(m_zipinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 531 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
532 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 532 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); |
533 | connect(m_zipinstaller, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int))); | 533 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
534 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 534 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); |
535 | m_zipinstaller->install(); | 535 | m_zipinstaller->install(); |
536 | } | 536 | } |
@@ -574,9 +574,9 @@ void SelectiveInstallWidget::installManual(void) | |||
574 | // if type is html extract it. | 574 | // if type is html extract it. |
575 | m_zipinstaller->setUnzip(mantype == "html"); | 575 | m_zipinstaller->setUnzip(mantype == "html"); |
576 | 576 | ||
577 | connect(m_zipinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 577 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
578 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 578 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); |
579 | connect(m_zipinstaller, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int))); | 579 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
580 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 580 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); |
581 | m_zipinstaller->install(); | 581 | m_zipinstaller->install(); |
582 | } | 582 | } |
@@ -669,9 +669,9 @@ void SelectiveInstallWidget::installPluginData(void) | |||
669 | m_zipinstaller->setMountPoint(m_mountpoint); | 669 | m_zipinstaller->setMountPoint(m_mountpoint); |
670 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) | 670 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) |
671 | m_zipinstaller->setCache(true); | 671 | m_zipinstaller->setCache(true); |
672 | connect(m_zipinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 672 | connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall); |
673 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); | 673 | connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int))); |
674 | connect(m_zipinstaller, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int))); | 674 | connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress); |
675 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); | 675 | connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort())); |
676 | m_zipinstaller->install(); | 676 | m_zipinstaller->install(); |
677 | } | 677 | } |