Reuse existing structures inside Update class.

Change-Id: I481b0129c5263da4969053d658e30fb671acf74e
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

4 files changed, 16 insertions, 36 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 217e41eea..1ba19ed2b 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -310,7 +310,7 @@ void Component::loadDataFromPackage(const Package &package)
         setCheckState(Qt::Checked);
     }
 
-    setLocalTempPath(QInstaller::pathFromUrl(package.sourceInfoUrl()));
+    setLocalTempPath(QInstaller::pathFromUrl(package.packageSource().url));
     const QStringList uis = package.data(QLatin1String("UserInterfaces")).toString()
         .split(QInstaller::commaRegExp(), QString::SkipEmptyParts);
     if (!uis.isEmpty())
diff --git a/src/libs/kdtools/kdupdaterupdate.cpp b/src/libs/kdtools/kdupdaterupdate.cpp
index 69872ea92..9b6f7b3d9 100644
--- a/src/libs/kdtools/kdupdaterupdate.cpp
+++ b/src/libs/kdtools/kdupdaterupdate.cpp
@@ -52,10 +52,9 @@ using namespace KDUpdater;
 /*!
    \internal
 */
-Update::Update(int priority, const QUrl &sourceInfoUrl, const QHash<QString, QVariant> &data)
-    : m_priority(priority)
-    , m_sourceInfoUrl(sourceInfoUrl)
-    , m_data(data)
+Update::Update(const QInstaller::PackageSource &packageSource, const UpdateInfo &updateInfo)
+    : m_packageSource(packageSource)
+    , m_updateInfo(updateInfo)
 {
 }
 
@@ -65,22 +64,5 @@ Update::Update(int priority, const QUrl &sourceInfoUrl, const QHash<QString, QVa
 */
 QVariant Update::data(const QString &name, const QVariant &defaultValue) const
 {
-    return m_data.value(name, defaultValue);
-}
-
-/*!
-   Returns the priority of the update.
-*/
-int Update::priority() const
-{
-    return m_priority;
-}
-
-/*!
-    Returns the URL of the update source. An update source is a repository that
-    contains an update for the application.
-*/
-QUrl Update::sourceInfoUrl() const
-{
-    return m_sourceInfoUrl;
+    return m_updateInfo.data.value(name, defaultValue);
 }
diff --git a/src/libs/kdtools/kdupdaterupdate.h b/src/libs/kdtools/kdupdaterupdate.h
index f676f0b31..ecd5508f5 100644
--- a/src/libs/kdtools/kdupdaterupdate.h
+++ b/src/libs/kdtools/kdupdaterupdate.h
@@ -35,8 +35,8 @@
 #ifndef KD_UPDATER_UPDATE_H
 #define KD_UPDATER_UPDATE_H
 
-#include <QHash>
-#include <QUrl>
+#include <packagesource.h>
+#include <kdupdaterupdatesinfo_p.h>
 #include <QVariant>
 
 namespace KDUpdater {
@@ -46,17 +46,15 @@ class Update
 public:
     QVariant data(const QString &name, const QVariant &defaultValue = QVariant()) const;
 
-    int priority() const;
-    QUrl sourceInfoUrl() const;
+    QInstaller::PackageSource packageSource() const {return m_packageSource; }
 
 private:
     friend class UpdateFinder;
-    Update(int p, const QUrl &sourceInfoUrl, const QHash<QString, QVariant> &data);
+    Update(const QInstaller::PackageSource &packageSource, const UpdateInfo &updateInfo);
 
 private:
-    int m_priority;
-    QUrl m_sourceInfoUrl;
-    QHash<QString, QVariant> m_data;
+    QInstaller::PackageSource m_packageSource;
+    UpdateInfo m_updateInfo;
 };
 
 } // namespace KDUpdater
diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp
index 09e0647b5..7c12213a7 100644
--- a/src/libs/kdtools/kdupdaterupdatefinder.cpp
+++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp
@@ -400,7 +400,7 @@ void UpdateFinder::Private::createUpdateObjects(const PackageSource &source,
             delete updates.take(name);
 
         // Create and register the update
-        updates.insert(name, new Update(source.priority, source.url, info.data));
+        updates.insert(name, new Update(source, info));
     }
 }
 
@@ -424,18 +424,18 @@ UpdateFinder::Private::Resolution UpdateFinder::Private::checkPriorityAndVersion
             qDebug() << QString::fromLatin1("Remove Package 'Name: %1, Version: %2, Source: %3' "
                 "found a package with higher version 'Name: %4, Version: %5, Source: %6'")
                 .arg(name, existingPackage->data(QLatin1String("Version")).toString(),
-                    QFileInfo(existingPackage->sourceInfoUrl().toLocalFile()).fileName(),
+                    QFileInfo(existingPackage->packageSource().url.toLocalFile()).fileName(),
                     name, newPackage.value(QLatin1String("Version")).toString(),
                     QFileInfo(source.url.toLocalFile()).fileName());
             return Resolution::RemoveExisting;
         }
 
-        if ((match == 0) && (source.priority > existingPackage->priority())) {
+        if ((match == 0) && (source.priority > existingPackage->packageSource().priority)) {
             // new package version equals but priority is higher, use
             qDebug() << QString::fromLatin1("Remove Package 'Name: %1, Priority: %2, Source: %3' "
                 "found a package with higher priority 'Name: %4, Priority: %5, Source: %6'")
-                .arg(name, QString::number(existingPackage->priority()),
-                    QFileInfo(existingPackage->sourceInfoUrl().toLocalFile()).fileName(),
+                .arg(name, QString::number(existingPackage->packageSource().priority),
+                    QFileInfo(existingPackage->packageSource().url.toLocalFile()).fileName(),
                     name, QString::number(source.priority),
                     QFileInfo(source.url.toLocalFile()).fileName());
             return Resolution::RemoveExisting;