diff options
Diffstat (limited to 'utils/rbutilqt/themesinstallwindow.cpp')
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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 | ||