diff options
Diffstat (limited to 'rbutil/rbutilqt/base/zipinstaller.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/zipinstaller.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp index 3376169911..8de6c53b16 100644 --- a/rbutil/rbutilqt/base/zipinstaller.cpp +++ b/rbutil/rbutilqt/base/zipinstaller.cpp | |||
@@ -34,7 +34,7 @@ void ZipInstaller::install() | |||
34 | LOG_INFO() << "initializing installation"; | 34 | LOG_INFO() << "initializing installation"; |
35 | 35 | ||
36 | m_runner = 0; | 36 | m_runner = 0; |
37 | connect(this, SIGNAL(cont()), this, SLOT(installContinue())); | 37 | connect(this, &ZipInstaller::cont, this, &ZipInstaller::installContinue); |
38 | m_url = m_urllist.at(m_runner); | 38 | m_url = m_urllist.at(m_runner); |
39 | m_logsection = m_loglist.at(m_runner); | 39 | m_logsection = m_loglist.at(m_runner); |
40 | m_logver = m_verlist.at(m_runner); | 40 | m_logver = m_verlist.at(m_runner); |
@@ -94,9 +94,9 @@ void ZipInstaller::installStart() | |||
94 | } | 94 | } |
95 | m_getter->setFile(m_downloadFile); | 95 | m_getter->setFile(m_downloadFile); |
96 | 96 | ||
97 | connect(m_getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 97 | connect(m_getter, &HttpGet::done, this, &ZipInstaller::downloadDone); |
98 | connect(m_getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int))); | 98 | connect(m_getter, &HttpGet::dataReadProgress, this, &ZipInstaller::logProgress); |
99 | connect(this, SIGNAL(internalAborted()), m_getter, SLOT(abort())); | 99 | connect(this, &ZipInstaller::internalAborted, m_getter, &HttpGet::abort); |
100 | 100 | ||
101 | m_getter->getFile(QUrl(m_url)); | 101 | m_getter->getFile(QUrl(m_url)); |
102 | } | 102 | } |
@@ -133,8 +133,8 @@ void ZipInstaller::downloadDone(bool error) | |||
133 | QCoreApplication::processEvents(); | 133 | QCoreApplication::processEvents(); |
134 | 134 | ||
135 | ZipUtil zip(this); | 135 | ZipUtil zip(this); |
136 | connect(&zip, SIGNAL(logProgress(int, int)), this, SIGNAL(logProgress(int, int))); | 136 | connect(&zip, &ZipUtil::logProgress, this, &ZipInstaller::logProgress); |
137 | connect(&zip, SIGNAL(logItem(QString, int)), this, SIGNAL(logItem(QString, int))); | 137 | connect(&zip, &ZipUtil::logItem, this, &ZipInstaller::logItem); |
138 | zip.open(m_file, QuaZip::mdUnzip); | 138 | zip.open(m_file, QuaZip::mdUnzip); |
139 | // check for free space. Make sure after installation will still be | 139 | // check for free space. Make sure after installation will still be |
140 | // some room for operating (also includes calculation mistakes due to | 140 | // some room for operating (also includes calculation mistakes due to |