From 6e1ee181d96104507fb1a42990905b8a98d10b10 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 1 Oct 2012 15:28:12 +0200 Subject: Fix naming. Change-Id: Ice29a1bed7bc78fbee522fab942ff3858a70be9c Reviewed-by: Tim Jenssen --- src/libs/installer/downloadarchivesjob.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libs/installer/downloadarchivesjob.cpp') 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 { -- cgit v1.2.3