diff options
-rw-r--r-- | utils/rbutilqt/base/httpget.h | 1 | ||||
-rw-r--r-- | utils/rbutilqt/base/mspackutil.h | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/utils.cpp | 4 | ||||
-rw-r--r-- | utils/rbutilqt/base/ziputil.h | 4 | ||||
-rw-r--r-- | utils/rbutilqt/gui/selectiveinstallwidget.cpp | 3 | ||||
-rw-r--r-- | utils/rbutilqt/progressloggergui.h | 20 | ||||
-rw-r--r-- | utils/rbutilqt/rbutilqt.cpp | 8 | ||||
-rw-r--r-- | utils/rbutilqt/sysinfo.cpp | 3 | ||||
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.cpp | 15 | ||||
-rw-r--r-- | utils/rbutilqt/themesinstallwindow.h | 1 |
10 files changed, 23 insertions, 40 deletions
diff --git a/utils/rbutilqt/base/httpget.h b/utils/rbutilqt/base/httpget.h index dfd7b87c89..472ad83b81 100644 --- a/utils/rbutilqt/base/httpget.h +++ b/utils/rbutilqt/base/httpget.h | |||
@@ -80,7 +80,6 @@ class HttpGet : public QObject | |||
80 | signals: | 80 | signals: |
81 | void done(bool); | 81 | void done(bool); |
82 | void dataReadProgress(int, int); | 82 | void dataReadProgress(int, int); |
83 | void requestFinished(int, bool); | ||
84 | void headerFinished(void); | 83 | void headerFinished(void); |
85 | 84 | ||
86 | private slots: | 85 | private slots: |
diff --git a/utils/rbutilqt/base/mspackutil.h b/utils/rbutilqt/base/mspackutil.h index 1cb4350b13..447ab9e802 100644 --- a/utils/rbutilqt/base/mspackutil.h +++ b/utils/rbutilqt/base/mspackutil.h | |||
@@ -36,10 +36,6 @@ class MsPackUtil : public ArchiveUtil | |||
36 | virtual bool extractArchive(const QString& dest, QString file = ""); | 36 | virtual bool extractArchive(const QString& dest, QString file = ""); |
37 | virtual QStringList files(void); | 37 | virtual QStringList files(void); |
38 | 38 | ||
39 | signals: | ||
40 | void logProgress(int, int); | ||
41 | void logItem(QString, int); | ||
42 | |||
43 | private: | 39 | private: |
44 | QString errorStringMsPack(int error) const; | 40 | QString errorStringMsPack(int error) const; |
45 | struct mscab_decompressor* m_cabd; | 41 | struct mscab_decompressor* m_cabd; |
diff --git a/utils/rbutilqt/base/utils.cpp b/utils/rbutilqt/base/utils.cpp index 285d48d6cf..b834567688 100644 --- a/utils/rbutilqt/base/utils.cpp +++ b/utils/rbutilqt/base/utils.cpp | |||
@@ -1053,11 +1053,11 @@ qint64 Utils::recursiveFolderSize(QString path) | |||
1053 | { | 1053 | { |
1054 | qint64 size = 0; | 1054 | qint64 size = 0; |
1055 | QList<QFileInfo> items = QDir(path).entryInfoList(QDir::Files | QDir::NoDotAndDotDot); | 1055 | QList<QFileInfo> items = QDir(path).entryInfoList(QDir::Files | QDir::NoDotAndDotDot); |
1056 | for (auto item: items) { | 1056 | for (const auto &item: qAsConst(items)) { |
1057 | size += item.size(); | 1057 | size += item.size(); |
1058 | } | 1058 | } |
1059 | QList<QString> folders = QDir(path).entryList(QDir::Dirs | QDir::NoDotAndDotDot); | 1059 | QList<QString> folders = QDir(path).entryList(QDir::Dirs | QDir::NoDotAndDotDot); |
1060 | for (auto const& folder: folders) { | 1060 | for (auto const& folder: qAsConst(folders)) { |
1061 | size += recursiveFolderSize(path + "/" + folder); | 1061 | size += recursiveFolderSize(path + "/" + folder); |
1062 | } | 1062 | } |
1063 | return size; | 1063 | return size; |
diff --git a/utils/rbutilqt/base/ziputil.h b/utils/rbutilqt/base/ziputil.h index 25c3dce391..73a87a820a 100644 --- a/utils/rbutilqt/base/ziputil.h +++ b/utils/rbutilqt/base/ziputil.h | |||
@@ -40,10 +40,6 @@ class ZipUtil : public ArchiveUtil | |||
40 | qint64 totalUncompressedSize(unsigned int clustersize = 0); | 40 | qint64 totalUncompressedSize(unsigned int clustersize = 0); |
41 | virtual QStringList files(void); | 41 | virtual QStringList files(void); |
42 | 42 | ||
43 | signals: | ||
44 | void logProgress(int, int); | ||
45 | void logItem(QString, int); | ||
46 | |||
47 | private: | 43 | private: |
48 | QList<QuaZipFileInfo> contentProperties(); | 44 | QList<QuaZipFileInfo> contentProperties(); |
49 | QuaZip* m_zip; | 45 | QuaZip* m_zip; |
diff --git a/utils/rbutilqt/gui/selectiveinstallwidget.cpp b/utils/rbutilqt/gui/selectiveinstallwidget.cpp index a558015ded..638082091b 100644 --- a/utils/rbutilqt/gui/selectiveinstallwidget.cpp +++ b/utils/rbutilqt/gui/selectiveinstallwidget.cpp | |||
@@ -600,7 +600,8 @@ void SelectiveInstallWidget::installThemes(void) | |||
600 | if(m_themesinstaller == nullptr) | 600 | if(m_themesinstaller == nullptr) |
601 | m_themesinstaller = new ThemesInstallWindow(this); | 601 | m_themesinstaller = new ThemesInstallWindow(this); |
602 | 602 | ||
603 | connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); | 603 | connect(m_themesinstaller, &ThemesInstallWindow::done, |
604 | this, &SelectiveInstallWidget::continueInstall); | ||
604 | m_themesinstaller->setLogger(m_logger); | 605 | m_themesinstaller->setLogger(m_logger); |
605 | m_themesinstaller->setModal(true); | 606 | m_themesinstaller->setModal(true); |
606 | m_themesinstaller->install(); | 607 | m_themesinstaller->install(); |
diff --git a/utils/rbutilqt/progressloggergui.h b/utils/rbutilqt/progressloggergui.h index cc9b7df323..acdb850507 100644 --- a/utils/rbutilqt/progressloggergui.h +++ b/utils/rbutilqt/progressloggergui.h | |||
@@ -31,23 +31,23 @@ class ProgressLoggerGui :public QObject | |||
31 | public: | 31 | public: |
32 | ProgressLoggerGui(QWidget * parent); | 32 | ProgressLoggerGui(QWidget * parent); |
33 | 33 | ||
34 | virtual void setProgressValue(int value); | 34 | void setProgressValue(int value); |
35 | virtual void setProgressMax(int max); | 35 | void setProgressMax(int max); |
36 | virtual int getProgressMax(); | 36 | int getProgressMax(); |
37 | virtual void setProgressVisible(bool); | 37 | void setProgressVisible(bool); |
38 | 38 | ||
39 | signals: | 39 | signals: |
40 | void aborted(); | 40 | void aborted(); |
41 | void closed(); | 41 | void closed(); |
42 | 42 | ||
43 | public slots: | 43 | public slots: |
44 | virtual void addItem(const QString &text, int flag); //! add a string to the list | 44 | void addItem(const QString &text, int flag); //! add a string to the list |
45 | virtual void setProgress(int, int); //! set progress bar | 45 | void setProgress(int, int); //! set progress bar |
46 | 46 | ||
47 | virtual void close(); | 47 | void close(); |
48 | virtual void show(); | 48 | void show(); |
49 | virtual void setRunning(); | 49 | void setRunning(); |
50 | virtual void setFinished(); | 50 | void setFinished(); |
51 | 51 | ||
52 | void saveErrorLog(); | 52 | void saveErrorLog(); |
53 | private: | 53 | private: |
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp index a9878646da..d0ff9f2799 100644 --- a/utils/rbutilqt/rbutilqt.cpp +++ b/utils/rbutilqt/rbutilqt.cpp | |||
@@ -279,11 +279,11 @@ void RbUtilQt::about() | |||
279 | licenses[":/docs/LICENSE.BZIP2"] = "<a id='bzip2'>bzip2 License</a>"; | 279 | licenses[":/docs/LICENSE.BZIP2"] = "<a id='bzip2'>bzip2 License</a>"; |
280 | licenses[":/docs/LICENSE.BSPATCH"] = "<a id='bspatch'>bspatch License</a>"; | 280 | licenses[":/docs/LICENSE.BSPATCH"] = "<a id='bspatch'>bspatch License</a>"; |
281 | 281 | ||
282 | for (auto const& key : licenses.keys()) { | 282 | for (auto it = licenses.keyBegin(); it != licenses.keyEnd(); ++it) { |
283 | QFile license(key); | 283 | QFile license(*it); |
284 | license.open(QIODevice::ReadOnly); | 284 | license.open(QIODevice::ReadOnly); |
285 | QTextStream s(&license); | 285 | QTextStream s(&license); |
286 | about.browserLicenses->insertHtml("<hr/><h2>" + licenses[key] + "</h2><br/>\n"); | 286 | about.browserLicenses->insertHtml("<hr/><h2>" + licenses[*it] + "</h2><br/>\n"); |
287 | about.browserLicenses->insertHtml("<pre>" + s.readAll() + "</pre>"); | 287 | about.browserLicenses->insertHtml("<pre>" + s.readAll() + "</pre>"); |
288 | license.close(); | 288 | license.close(); |
289 | } | 289 | } |
@@ -675,7 +675,7 @@ void RbUtilQt::downloadUpdateDone(bool error) | |||
675 | tr("<b>New Rockbox Utility version available.</b><br><br>" | 675 | tr("<b>New Rockbox Utility version available.</b><br><br>" |
676 | "You are currently using version %1. " | 676 | "You are currently using version %1. " |
677 | "Get version %2 at <a href='%3'>%3</a>") | 677 | "Get version %2 at <a href='%3'>%3</a>") |
678 | .arg(VERSION).arg(Utils::trimVersionString(foundVersion)).arg(url)); | 678 | .arg(VERSION, Utils::trimVersionString(foundVersion), url)); |
679 | ui.statusbar->showMessage(tr("New version of Rockbox Utility available.")); | 679 | ui.statusbar->showMessage(tr("New version of Rockbox Utility available.")); |
680 | } | 680 | } |
681 | else { | 681 | else { |
diff --git a/utils/rbutilqt/sysinfo.cpp b/utils/rbutilqt/sysinfo.cpp index b753c628f0..c9f928006c 100644 --- a/utils/rbutilqt/sysinfo.cpp +++ b/utils/rbutilqt/sysinfo.cpp | |||
@@ -72,8 +72,7 @@ QString Sysinfo::getInfo(Sysinfo::InfoType type) | |||
72 | .arg(QDir::toNativeSeparators(drives.at(i))) | 72 | .arg(QDir::toNativeSeparators(drives.at(i))) |
73 | .arg((double)Utils::filesystemFree(drives.at(i)) / (1<<30), 0, 'f', 2) | 73 | .arg((double)Utils::filesystemFree(drives.at(i)) / (1<<30), 0, 'f', 2) |
74 | .arg((double)Utils::filesystemTotal(drives.at(i)) / (1<<30), 0, 'f', 2) | 74 | .arg((double)Utils::filesystemTotal(drives.at(i)) / (1<<30), 0, 'f', 2) |
75 | .arg(Utils::filesystemName(drives.at(i))) | 75 | .arg(Utils::filesystemName(drives.at(i)), Utils::filesystemType(drives.at(i))); |
76 | .arg(Utils::filesystemType(drives.at(i))); | ||
77 | } | 76 | } |
78 | info += "</table>"; | 77 | info += "</table>"; |
79 | info += "<hr/>"; | 78 | info += "<hr/>"; |
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 | } |
diff --git a/utils/rbutilqt/themesinstallwindow.h b/utils/rbutilqt/themesinstallwindow.h index 9214e5ccbf..96a1ea42b4 100644 --- a/utils/rbutilqt/themesinstallwindow.h +++ b/utils/rbutilqt/themesinstallwindow.h | |||
@@ -66,7 +66,6 @@ class ThemesInstallWindow : public QDialog | |||
66 | 66 | ||
67 | private slots: | 67 | private slots: |
68 | void downloadDone(bool); | 68 | void downloadDone(bool); |
69 | void downloadDone(int, bool); | ||
70 | void updateImage(bool); | 69 | void updateImage(bool); |
71 | void abort(void); | 70 | void abort(void); |
72 | void updateDetails(QListWidgetItem* cur, QListWidgetItem* prev); | 71 | void updateDetails(QListWidgetItem* cur, QListWidgetItem* prev); |