From f9d23bfd41d36ac1c39b31ff7d45ebe1597ed4f4 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Wed, 16 Dec 2020 17:34:28 +0100 Subject: rbutil: Modernize connect() to new pointer-to-member syntax. Change-Id: If737fe5a8f4ab9f83560511839fdc4ad8b187786 --- rbutil/rbutilqt/base/zipinstaller.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'rbutil/rbutilqt/base/zipinstaller.cpp') 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() LOG_INFO() << "initializing installation"; m_runner = 0; - connect(this, SIGNAL(cont()), this, SLOT(installContinue())); + connect(this, &ZipInstaller::cont, this, &ZipInstaller::installContinue); m_url = m_urllist.at(m_runner); m_logsection = m_loglist.at(m_runner); m_logver = m_verlist.at(m_runner); @@ -94,9 +94,9 @@ void ZipInstaller::installStart() } m_getter->setFile(m_downloadFile); - connect(m_getter, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); - connect(m_getter, SIGNAL(dataReadProgress(int, int)), this, SIGNAL(logProgress(int, int))); - connect(this, SIGNAL(internalAborted()), m_getter, SLOT(abort())); + connect(m_getter, &HttpGet::done, this, &ZipInstaller::downloadDone); + connect(m_getter, &HttpGet::dataReadProgress, this, &ZipInstaller::logProgress); + connect(this, &ZipInstaller::internalAborted, m_getter, &HttpGet::abort); m_getter->getFile(QUrl(m_url)); } @@ -133,8 +133,8 @@ void ZipInstaller::downloadDone(bool error) QCoreApplication::processEvents(); ZipUtil zip(this); - connect(&zip, SIGNAL(logProgress(int, int)), this, SIGNAL(logProgress(int, int))); - connect(&zip, SIGNAL(logItem(QString, int)), this, SIGNAL(logItem(QString, int))); + connect(&zip, &ZipUtil::logProgress, this, &ZipInstaller::logProgress); + connect(&zip, &ZipUtil::logItem, this, &ZipInstaller::logItem); zip.open(m_file, QuaZip::mdUnzip); // check for free space. Make sure after installation will still be // some room for operating (also includes calculation mistakes due to -- cgit v1.2.3