diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-28 16:40:16 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-28 17:57:04 +0100 |
commit | f53f1fbafab6f994a4ed5f63d884d27c42739d53 (patch) | |
tree | c6060e771d096cbe9b97d95bef5d7cb0a8ac4824 /utils/rbutilqt/themesinstallwindow.cpp | |
parent | 7dffbd84af8d4857f357ac33bd74fda3608c7ebd (diff) | |
download | rockbox-f53f1fbafab6f994a4ed5f63d884d27c42739d53.tar.gz rockbox-f53f1fbafab6f994a4ed5f63d884d27c42739d53.zip |
rbutil: Fix some more issues found by clazy.
Change-Id: I0a1a849ecea4b4666b08ccb050eb17918e90a258
Diffstat (limited to 'utils/rbutilqt/themesinstallwindow.cpp')
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/utils/rbutilqt/themesinstallwindow.cpp b/utils/rbutilqt/themesinstallwindow.cpp index 129df8a980..e6043de892 100644 --- a/utils/rbutilqt/themesinstallwindow.cpp +++ b/utils/rbutilqt/themesinstallwindow.cpp | |||
@@ -44,7 +44,7 @@ ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent) | |||
44 | ui.themeDescription->setLayoutDirection(Qt::LeftToRight); | 44 | ui.themeDescription->setLayoutDirection(Qt::LeftToRight); |
45 | 45 | ||
46 | connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close); | 46 | connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close); |
47 | connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept())); | 47 | connect(ui.buttonOk, &QAbstractButton::clicked, this, &ThemesInstallWindow::accept); |
48 | connect(ui.listThemes, &QListWidget::currentItemChanged, | 48 | connect(ui.listThemes, &QListWidget::currentItemChanged, |
49 | this, &ThemesInstallWindow::updateDetails); | 49 | this, &ThemesInstallWindow::updateDetails); |
50 | connect(ui.listThemes, &QListWidget::itemSelectionChanged, this, &ThemesInstallWindow::updateSize); | 50 | connect(ui.listThemes, &QListWidget::itemSelectionChanged, this, &ThemesInstallWindow::updateSize); |
@@ -94,19 +94,12 @@ void ThemesInstallWindow::downloadInfo() | |||
94 | LOG_INFO() << "Info URL:" << url; | 94 | LOG_INFO() << "Info URL:" << url; |
95 | getter->setFile(&themesInfo); | 95 | getter->setFile(&themesInfo); |
96 | 96 | ||
97 | connect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 97 | connect(getter, &HttpGet::done, this, &ThemesInstallWindow::downloadDone); |
98 | connect(logger, &ProgressLoggerGui::aborted, getter, &HttpGet::abort); | 98 | connect(logger, &ProgressLoggerGui::aborted, getter, &HttpGet::abort); |
99 | getter->getFile(url); | 99 | getter->getFile(url); |
100 | } | 100 | } |
101 | 101 | ||
102 | 102 | ||
103 | void ThemesInstallWindow::downloadDone(int id, bool error) | ||
104 | { | ||
105 | downloadDone(error); | ||
106 | LOG_INFO() << "Download" << id << "done, error:" << error; | ||
107 | } | ||
108 | |||
109 | |||
110 | void ThemesInstallWindow::downloadDone(bool error) | 103 | void ThemesInstallWindow::downloadDone(bool error) |
111 | { | 104 | { |
112 | LOG_INFO() << "Download done, error:" << error; | 105 | LOG_INFO() << "Download done, error:" << error; |
@@ -129,7 +122,7 @@ void ThemesInstallWindow::downloadDone(bool error) | |||
129 | .arg(getter->errorString()), LOGERROR); | 122 | .arg(getter->errorString()), LOGERROR); |
130 | getter->abort(); | 123 | getter->abort(); |
131 | logger->setFinished(); | 124 | logger->setFinished(); |
132 | disconnect(getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 125 | disconnect(getter, &HttpGet::done, this, &ThemesInstallWindow::downloadDone); |
133 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); | 126 | connect(logger, &ProgressLoggerGui::closed, this, &QWidget::close); |
134 | return; | 127 | return; |
135 | } | 128 | } |
@@ -376,7 +369,7 @@ void ThemesInstallWindow::install() | |||
376 | } | 369 | } |
377 | connect(installer, &ZipInstaller::logItem, logger, &ProgressLoggerGui::addItem); | 370 | connect(installer, &ZipInstaller::logItem, logger, &ProgressLoggerGui::addItem); |
378 | connect(installer, &ZipInstaller::logProgress, logger, &ProgressLoggerGui::setProgress); | 371 | connect(installer, &ZipInstaller::logProgress, logger, &ProgressLoggerGui::setProgress); |
379 | connect(installer, SIGNAL(done(bool)), this, SIGNAL(done(bool))); | 372 | connect(installer, &ZipInstaller::done, this, &ThemesInstallWindow::done); |
380 | connect(logger, &ProgressLoggerGui::aborted, installer, &ZipInstaller::abort); | 373 | connect(logger, &ProgressLoggerGui::aborted, installer, &ZipInstaller::abort); |
381 | installer->install(); | 374 | installer->install(); |
382 | } | 375 | } |