diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-11-01 10:38:13 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-01-09 05:41:16 +0000 |
| commit | 9dacee18f9b7211699164bc70dd17f9934a15f50 (patch) | |
| tree | d16ee18d0f54a9c28f07aeebab77bb8b9168da55 /src/libs/installer/downloadarchivesjob.cpp | |
| parent | 818c8ab9836c3e949e891e2266807dbd59c31906 (diff) | |
Replace 0 with nullptr
Prevents a lot of warnings seen in QtCreator
Change-Id: I63bf95aca68a04fc9fd0eecbe29c63e9b9c47efd
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src/libs/installer/downloadarchivesjob.cpp')
| -rw-r--r-- | src/libs/installer/downloadarchivesjob.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp index 80c094ae0..102783133 100644 --- a/src/libs/installer/downloadarchivesjob.cpp +++ b/src/libs/installer/downloadarchivesjob.cpp @@ -49,7 +49,7 @@ using namespace KDUpdater; DownloadArchivesJob::DownloadArchivesJob(PackageManagerCore *core) : Job(core) , m_core(core) - , m_downloader(0) + , m_downloader(nullptr) , m_archivesDownloaded(0) , m_archivesToDownloadCount(0) , m_canceled(false) @@ -93,7 +93,7 @@ void DownloadArchivesJob::doStart() void DownloadArchivesJob::doCancel() { m_canceled = true; - if (m_downloader != 0) + if (m_downloader != nullptr) m_downloader->cancelDownload(); } @@ -130,7 +130,7 @@ void DownloadArchivesJob::fetchNextArchiveHash() void DownloadArchivesJob::finishedHashDownload() { - Q_ASSERT(m_downloader != 0); + Q_ASSERT(m_downloader != nullptr); QFile sha1HashFile(m_downloader->downloadedFileName()); if (sha1HashFile.open(QFile::ReadOnly)) { @@ -156,7 +156,7 @@ void DownloadArchivesJob::fetchNextArchive() return; } - if (m_downloader != 0) + if (m_downloader != nullptr) m_downloader->deleteLater(); m_downloader = setupDownloader(QString(), m_core->value(scUrlQueryString)); @@ -202,7 +202,7 @@ void DownloadArchivesJob::timerEvent(QTimerEvent *event) */ void DownloadArchivesJob::registerFile() { - Q_ASSERT(m_downloader != 0); + Q_ASSERT(m_downloader != nullptr); if (m_canceled) return; @@ -259,7 +259,7 @@ void DownloadArchivesJob::finishWithError(const QString &error) { const FileDownloader *const dl = qobject_cast<const FileDownloader*> (sender()); const QString msg = tr("Cannot fetch archives: %1\nError while loading %2"); - if (dl != 0) + if (dl != nullptr) emitFinishedWithError(QInstaller::DownloadError, msg.arg(error, dl->url().toString())); else emitFinishedWithError(QInstaller::DownloadError, msg.arg(error, m_downloader->url().toString())); @@ -267,7 +267,7 @@ void DownloadArchivesJob::finishWithError(const QString &error) KDUpdater::FileDownloader *DownloadArchivesJob::setupDownloader(const QString &suffix, const QString &queryString) { - KDUpdater::FileDownloader *downloader = 0; + KDUpdater::FileDownloader *downloader = nullptr; const QFileInfo fi = QFileInfo(m_archivesToDownload.first().first); const Component *const component = m_core->componentByName(PackageManagerCore::checkableName(QFileInfo(fi.path()).fileName())); if (component) { |