diff options
author | kh1 <karsten.heimrich@nokia.com> | 2012-10-01 15:28:12 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2012-10-01 18:42:24 +0200 |
commit | 6e1ee181d96104507fb1a42990905b8a98d10b10 (patch) | |
tree | 4d8669f2bb84e22a0acad237be9d9f483c26100f | |
parent | c8cc7d5b521c29e0968ce11dd9c63de0ce260c49 (diff) |
Fix naming.
Change-Id: Ice29a1bed7bc78fbee522fab942ff3858a70be9c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r-- | src/libs/installer/downloadarchivesjob.cpp | 8 | ||||
-rw-r--r-- | src/libs/installer/downloadarchivesjob.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/installer/downloadarchivesjob.cpp b/src/libs/installer/downloadarchivesjob.cpp index f44c5c1f8..74f5cdd5a 100644 --- a/src/libs/installer/downloadarchivesjob.cpp +++ b/src/libs/installer/downloadarchivesjob.cpp @@ -289,13 +289,13 @@ void DownloadArchivesJob::finishWithError(const QString &error) emitFinishedWithError(QInstaller::DownloadError, msg.arg(error, m_downloader->url().toString())); } -KDUpdater::FileDownloader *DownloadArchivesJob::setupDownloader(const QString &prefix) +KDUpdater::FileDownloader *DownloadArchivesJob::setupDownloader(const QString &suffix) { KDUpdater::FileDownloader *downloader = 0; const QFileInfo fi = QFileInfo(m_archivesToDownload.first().first); const Component *const component = m_core->componentByName(QFileInfo(fi.path()).fileName()); if (component) { - const QUrl url(m_archivesToDownload.first().second + prefix); + const QUrl url(m_archivesToDownload.first().second + suffix); const QString &scheme = url.scheme(); downloader = FileDownloaderFactory::instance().create(scheme, this); @@ -316,11 +316,11 @@ KDUpdater::FileDownloader *DownloadArchivesJob::setupDownloader(const QString &p if (scheme == QLatin1String("http") || scheme == QLatin1String("ftp") || scheme == QLatin1String("file")) { downloader->setDownloadedFileName(component->localTempPath() + QLatin1String("/") - + component->name() + QLatin1String("/") + fi.fileName() + prefix); + + component->name() + QLatin1String("/") + fi.fileName() + suffix); } QString message = tr("Downloading archive hash for component: %1"); - if (prefix.isEmpty()) + if (suffix.isEmpty()) message = tr("Downloading archive for component: %1"); emit outputTextChanged(message.arg(component->displayName())); } else { diff --git a/src/libs/installer/downloadarchivesjob.h b/src/libs/installer/downloadarchivesjob.h index 1c0c9b272..3787d055d 100644 --- a/src/libs/installer/downloadarchivesjob.h +++ b/src/libs/installer/downloadarchivesjob.h @@ -82,7 +82,7 @@ protected Q_SLOTS: void emitDownloadProgress(double progress); private: - KDUpdater::FileDownloader *setupDownloader(const QString &prefix = QString()); + KDUpdater::FileDownloader *setupDownloader(const QString &suffix = QString()); private: PackageManagerCore *m_core; |