summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-01-28 14:54:42 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-01-29 11:16:47 +0100
commite19862494a731f760cb9b4fad517d6fcc5f8cc28 (patch)
tree35ea780c3a84a9971e053ac2a334ab518f49f3c8
parent86b9ab3328b88a3fda08378b162158c58324414d (diff)
Rename to be more generic.
Change-Id: I3518f1fe2823eaf2513dafba9848fee6e9c5417a Reviewed-by: Niels Weber <niels.weber@digia.com>
-rw-r--r--src/libs/installer/abstractfiletask.h20
-rw-r--r--src/libs/installer/downloadfiletask.cpp4
-rw-r--r--src/libs/installer/getrepositorymetainfojob.cpp2
3 files changed, 13 insertions, 13 deletions
diff --git a/src/libs/installer/abstractfiletask.h b/src/libs/installer/abstractfiletask.h
index 0a2df9e3d..5a23d7b0c 100644
--- a/src/libs/installer/abstractfiletask.h
+++ b/src/libs/installer/abstractfiletask.h
@@ -56,7 +56,7 @@
namespace QInstaller {
-namespace FileTaskRole {
+namespace TaskRole {
enum
{
Checksum,
@@ -72,16 +72,16 @@ public:
FileTaskItem() {}
explicit FileTaskItem(const QString &s)
{
- insert(FileTaskRole::SourceFile, s);
+ insert(TaskRole::SourceFile, s);
}
FileTaskItem(const QString &s, const QString &t)
{
- insert(FileTaskRole::SourceFile, s);
- insert(FileTaskRole::TargetFile, t);
+ insert(TaskRole::SourceFile, s);
+ insert(TaskRole::TargetFile, t);
}
- QString source() const { return value(FileTaskRole::SourceFile).toString(); }
- QString target() const { return value(FileTaskRole::TargetFile).toString(); }
+ QString source() const { return value(TaskRole::SourceFile).toString(); }
+ QString target() const { return value(TaskRole::TargetFile).toString(); }
};
class FileTaskResult : public TaskData
@@ -90,12 +90,12 @@ public:
FileTaskResult() {}
FileTaskResult(const QString &t, const QByteArray &c)
{
- insert(FileTaskRole::Checksum, c);
- insert(FileTaskRole::TargetFile, t);
+ insert(TaskRole::Checksum, c);
+ insert(TaskRole::TargetFile, t);
}
- QString target() const { return value(FileTaskRole::TargetFile).toString(); }
- QByteArray checkSum() const { return value(FileTaskRole::Checksum).toByteArray(); }
+ QString target() const { return value(TaskRole::TargetFile).toString(); }
+ QByteArray checkSum() const { return value(TaskRole::Checksum).toByteArray(); }
};
class FileTaskException : public QException
diff --git a/src/libs/installer/downloadfiletask.cpp b/src/libs/installer/downloadfiletask.cpp
index 3e1c903d2..53a04c9f4 100644
--- a/src/libs/installer/downloadfiletask.cpp
+++ b/src/libs/installer/downloadfiletask.cpp
@@ -174,7 +174,7 @@ void Downloader::onFinished(QNetworkReply *reply)
delete data.observer;
FileTaskItem taskItem(url.toString(), filename);
- taskItem.insert(FileTaskRole::Checksum, data.expectedCheckSum);
+ taskItem.insert(TaskRole::Checksum, data.expectedCheckSum);
QNetworkReply *const redirectReply = startDownload(taskItem);
foreach (const QUrl &redirect, redirects)
@@ -315,7 +315,7 @@ QNetworkReply *Downloader::startDownload(const FileTaskItem &item)
QNetworkReply *reply = m_nam.get(QNetworkRequest(source));
m_downloads.insert(reply, Data(file.take(), new FileTaskObserver(QCryptographicHash::Sha1),
- item.value(FileTaskRole::Checksum).toByteArray()));
+ item.value(TaskRole::Checksum).toByteArray()));
connect(reply, SIGNAL(readyRead()), this, SLOT(onReadyRead()));
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this,
diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp
index 14cc2dd75..8b6b53484 100644
--- a/src/libs/installer/getrepositorymetainfojob.cpp
+++ b/src/libs/installer/getrepositorymetainfojob.cpp
@@ -443,7 +443,7 @@ void GetRepositoryMetaInfoJob::downloadMetaInfo()
for (int i = 0; i < m_packageNames.count(); ++i) {
items.append(FileTaskItem(QString::fromLatin1("%1/%2/%3meta.7z").arg(repoUrl,
m_packageNames.at(i), (online ? m_packageVersions.at(i) : QString()))));
- items[i].insert(FileTaskRole::Checksum, m_packageHash.value(i).toLatin1());
+ items[i].insert(TaskRole::Checksum, m_packageHash.value(i).toLatin1());
}
QAuthenticator auth;