diff options
Diffstat (limited to 'utils/rbutilqt/themesinstallwindow.cpp')
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp index c1a54feb74..358bd7f1a1 100644 --- a/utils/rbutilqt/themesinstallwindow.cpp +++ b/utils/rbutilqt/themesinstallwindow.cpp | |||
@@ -43,12 +43,12 @@ ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent) | |||
43 | ui.listThemes->setLayoutDirection(Qt::LeftToRight); | 43 | ui.listThemes->setLayoutDirection(Qt::LeftToRight); |
44 | ui.themeDescription->setLayoutDirection(Qt::LeftToRight); | 44 | ui.themeDescription->setLayoutDirection(Qt::LeftToRight); |
45 | 45 | ||
46 | connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(close())); | 46 | connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close); |
47 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); | 47 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); |
48 | connect(ui.listThemes, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), | 48 | connect(ui.listThemes, &QListWidget::currentItemChanged, |
49 | this, SLOT(updateDetails(QListWidgetItem*, QListWidgetItem*))); | 49 | this, &ThemesInstallWindow::updateDetails); |
50 | connect(ui.listThemes, SIGNAL(itemSelectionChanged()), this, SLOT(updateSize())); | 50 | connect(ui.listThemes, &QListWidget::itemSelectionChanged, this, &ThemesInstallWindow::updateSize); |
51 | connect(&igetter, SIGNAL(done(bool)), this, SLOT(updateImage(bool))); | 51 | connect(&igetter, &HttpGet::done, this, &ThemesInstallWindow::updateImage); |
52 | 52 | ||
53 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) | 53 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) |
54 | igetter.setCache(true); | 54 | igetter.setCache(true); |
@@ -130,7 +130,7 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
130 | getter->abort(); | 130 | getter->abort(); |
131 | logger->setFinished(); | 131 | logger->setFinished(); |
132 | disconnect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 132 | disconnect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); |
133 | connect(logger, SIGNAL(closed()), this, SLOT(close())); | 133 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); |
134 | return; | 134 | return; |
135 | } | 135 | } |
136 | // handle possible error codes | 136 | // handle possible error codes |
@@ -140,7 +140,7 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
140 | logger->addItem(tr("the following error occured:\n%1") | 140 | logger->addItem(tr("the following error occured:\n%1") |
141 | .arg(iniDetails.value("error/description", "unknown error").toString()), LOGERROR); | 141 | .arg(iniDetails.value("error/description", "unknown error").toString()), LOGERROR); |
142 | logger->setFinished(); | 142 | logger->setFinished(); |
143 | connect(logger, SIGNAL(closed()), this, SLOT(close())); | 143 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); |
144 | return; | 144 | return; |
145 | } | 145 | } |
146 | logger->addItem(tr("done."), LOGOK); | 146 | logger->addItem(tr("done."), LOGOK); |
@@ -371,11 +371,11 @@ void ThemesInstallWindow::install() | |||
371 | installer->setCache(true); | 371 | installer->setCache(true); |
372 | 372 | ||
373 | if(!windowSelectOnly) { | 373 | if(!windowSelectOnly) { |
374 | connect(logger, SIGNAL(closed()), this, SLOT(close())); | 374 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); |
375 | connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); | 375 | connect(installer, SIGNAL(done(bool)), logger, SLOT(setFinished())); |
376 | } | 376 | } |
377 | connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 377 | connect(installer, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); |
378 | connect(installer, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | 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, SIGNAL(aborted()), installer, SLOT(abort())); |
381 | installer->install(); | 381 | installer->install(); |