Rename classes to reflect their use. Remove typedef.

Change-Id: I5abb64d356a0951671487b60529a0ca26b0909be
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

10 files changed, 111 insertions, 106 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 5fe679ad8..43ad5031e 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -246,7 +246,7 @@ Component::~Component()
 /*!
     Sets variables according to the values set in the package.xml file of a local \a package.
 */
-void Component::loadDataFromPackage(const LocalPackage &package)
+void Component::loadDataFromPackage(const KDUpdater::LocalPackage &package)
 {
     setValue(scName, package.name);
     // pixmap ???
diff --git a/src/libs/installer/component.h b/src/libs/installer/component.h
index 3382dcf0d..ecf786b53 100644
--- a/src/libs/installer/component.h
+++ b/src/libs/installer/component.h
@@ -46,11 +46,6 @@
 
 QT_FORWARD_DECLARE_CLASS(QDebug)
 
-namespace KDUpdater {
-    class Update;
-    struct PackageInfo;
-}
-
 namespace QInstaller {
 
 class PackageManagerCore;
@@ -94,7 +89,7 @@ public:
     };
 
     void loadDataFromPackage(const Package &package);
-    void loadDataFromPackage(const LocalPackage &package);
+    void loadDataFromPackage(const KDUpdater::LocalPackage &package);
 
     QHash<QString, QString> variables() const;
     Q_INVOKABLE void setValue(const QString &key, const QString &value);
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index e2e52a6db..a3a7aae97 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -363,7 +363,7 @@ void PackageManagerCore::writeMaintenanceTool()
                 gainAdminRights();
                 gainedAdminRights = true;
             }
-            d->m_packagesInfo->writeToDisk();
+            d->m_localPackageHub->writeToDisk();
             if (gainedAdminRights)
                 dropAdminRights();
             d->m_needToWriteMaintenanceTool = false;
@@ -659,14 +659,14 @@ void PackageManagerCore::rollBackInstallation()
                     component = d->componentsToReplace().value(componentName).second;
                 if (component) {
                     component->setUninstalled();
-                    d->m_packagesInfo->removePackage(component->name());
+                    d->m_localPackageHub->removePackage(component->name());
                 }
             }
 
-            d->m_packagesInfo->writeToDisk();
+            d->m_localPackageHub->writeToDisk();
             if (isInstaller()) {
-                if (d->m_packagesInfo->packageInfoCount() == 0) {
-                    QFile file(d->m_packagesInfo->fileName());
+                if (d->m_localPackageHub->packageInfoCount() == 0) {
+                    QFile file(d->m_localPackageHub->fileName());
                     file.remove();
                 }
             }
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 0b51be1c8..0295454d6 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -186,7 +186,7 @@ static void deferredRename(const QString &oldName, const QString &newName, bool
 
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
     : m_updateFinder(0)
-    , m_packagesInfo(std::make_shared<PackagesInfo>())
+    , m_localPackageHub(std::make_shared<LocalPackageHub>())
     , m_core(core)
     , m_updates(false)
     , m_repoFetched(false)
@@ -207,7 +207,7 @@ PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
 PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
         const QList<OperationBlob> &performedOperations)
     : m_updateFinder(0)
-    , m_packagesInfo(std::make_shared<PackagesInfo>())
+    , m_localPackageHub(std::make_shared<LocalPackageHub>())
     , m_status(PackageManagerCore::Unfinished)
     , m_needsHardRestart(false)
     , m_testChecksum(false)
@@ -560,15 +560,15 @@ void PackageManagerCorePrivate::initialize(const QHash<QString, QString> &params
     connect(this, SIGNAL(uninstallationStarted()), ProgressCoordinator::instance(), SLOT(reset()));
 
     if (!isInstaller())
-        m_packagesInfo->setFileName(componentsXmlPath());
+        m_localPackageHub->setFileName(componentsXmlPath());
 
-    if (isInstaller() || m_packagesInfo->applicationName().isEmpty()) {
+    if (isInstaller() || m_localPackageHub->applicationName().isEmpty()) {
         // TODO: this seems to be wrong, we should ask for ProductName defaulting to applicationName...
-        m_packagesInfo->setApplicationName(m_data.settings().applicationName());
+        m_localPackageHub->setApplicationName(m_data.settings().applicationName());
     }
 
-    if (isInstaller() || m_packagesInfo->applicationVersion().isEmpty())
-        m_packagesInfo->setApplicationVersion(QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
+    if (isInstaller() || m_localPackageHub->applicationVersion().isEmpty())
+        m_localPackageHub->setApplicationVersion(QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
 
     if (isInstaller())
         m_packageSources.insert(PackageSource(QUrl(QLatin1String("resource://metadata/")), 0));
@@ -1478,13 +1478,13 @@ bool PackageManagerCorePrivate::runInstaller()
             componentsInstallPartProgressSize = double(1);
 
         // Force an update on the components xml as the install dir might have changed.
-        m_packagesInfo->setFileName(componentsXmlPath());
+        m_localPackageHub->setFileName(componentsXmlPath());
         // Clear the packages as we might install into an already existing installation folder.
-        m_packagesInfo->clearPackageInfoList();
+        m_localPackageHub->clearPackageInfos();
         // also update the application name, might be set from a script as well
-        m_packagesInfo->setApplicationName(m_data.value(QLatin1String("ProductName"),
+        m_localPackageHub->setApplicationName(m_data.value(QLatin1String("ProductName"),
             m_data.settings().applicationName()).toString());
-        m_packagesInfo->setApplicationVersion(QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
+        m_localPackageHub->setApplicationVersion(QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
 
         const int progressOperationCount = countProgressOperations(componentsToInstall)
             // add one more operation as we support progress
@@ -1900,12 +1900,12 @@ void PackageManagerCorePrivate::installComponent(Component *component, double pr
     }
 
     // now mark the component as installed
-    m_packagesInfo->addPackage(component->name(), component->value(scVersion),
+    m_localPackageHub->addPackage(component->name(), component->value(scVersion),
         component->value(scDisplayName),
         component->value(scDescription), component->dependencies(), component->forcedInstallation(),
         component->isVirtual(), component->value(scUncompressedSize).toULongLong(),
         component->value(scInheritVersion));
-    m_packagesInfo->writeToDisk();
+    m_localPackageHub->writeToDisk();
 
     component->setInstalled();
     component->markAsPerformedInstallation();
@@ -2061,7 +2061,7 @@ void PackageManagerCorePrivate::runUndoOperations(const OperationList &undoOpera
                     component = componentsToReplace().value(componentName).second;
                 if (component) {
                     component->setUninstalled();
-                    m_packagesInfo->removePackage(component->name());
+                    m_localPackageHub->removePackage(component->name());
                 }
             }
 
@@ -2072,13 +2072,13 @@ void PackageManagerCorePrivate::runUndoOperations(const OperationList &undoOpera
                 delete undoOperation;
         }
     } catch (const Error &error) {
-        m_packagesInfo->writeToDisk();
+        m_localPackageHub->writeToDisk();
         throw Error(error.message());
     } catch (...) {
-        m_packagesInfo->writeToDisk();
+        m_localPackageHub->writeToDisk();
         throw Error(tr("Unknown error"));
     }
-    m_packagesInfo->writeToDisk();
+    m_localPackageHub->writeToDisk();
 }
 
 PackagesList PackageManagerCorePrivate::remotePackages()
@@ -2091,8 +2091,8 @@ PackagesList PackageManagerCorePrivate::remotePackages()
 
     m_updateFinder = new KDUpdater::UpdateFinder;
     m_updateFinder->setAutoDelete(false);
-    m_updateFinder->setPackagesInfo(m_packagesInfo);
     m_updateFinder->setPackageSources(m_packageSources);
+    m_updateFinder->setLocalPackageHub(m_localPackageHub);
     m_updateFinder->run();
 
     if (m_updateFinder->updates().isEmpty()) {
@@ -2116,24 +2116,24 @@ LocalPackagesHash PackageManagerCorePrivate::localInstalledPackages()
         return LocalPackagesHash();
 
     LocalPackagesHash installedPackages;
-    if (m_packagesInfo->error() != PackagesInfo::NoError) {
-        if (m_packagesInfo->fileName().isEmpty())
-            m_packagesInfo->setFileName(componentsXmlPath());
+    if (m_localPackageHub->error() != LocalPackageHub::NoError) {
+        if (m_localPackageHub->fileName().isEmpty())
+            m_localPackageHub->setFileName(componentsXmlPath());
         else
-            m_packagesInfo->refresh();
+            m_localPackageHub->refresh();
 
-        if (m_packagesInfo->applicationName().isEmpty())
-            m_packagesInfo->setApplicationName(m_data.settings().applicationName());
-        if (m_packagesInfo->applicationVersion().isEmpty())
-            m_packagesInfo->setApplicationVersion(QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
+        if (m_localPackageHub->applicationName().isEmpty())
+            m_localPackageHub->setApplicationName(m_data.settings().applicationName());
+        if (m_localPackageHub->applicationVersion().isEmpty())
+            m_localPackageHub->setApplicationVersion(QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
     }
 
-    if (m_packagesInfo->error() != PackagesInfo::NoError) {
+    if (m_localPackageHub->error() != LocalPackageHub::NoError) {
         setStatus(PackageManagerCore::Failure, tr("Failure to read packages from: %1.")
             .arg(componentsXmlPath()));
     }
 
-    foreach (const LocalPackage &package, m_packagesInfo->packageInfos()) {
+    foreach (const LocalPackage &package, m_localPackageHub->packageInfos()) {
         if (statusCanceledOrFailed())
             break;
         installedPackages.insert(package.name, package);
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 0a5e5ca17..6a7db3edb 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -177,7 +177,7 @@ signals:
 public:
     UpdateFinder *m_updateFinder;
     QSet<PackageSource> m_packageSources;
-    std::shared_ptr<PackagesInfo> m_packagesInfo;
+    std::shared_ptr<LocalPackageHub> m_localPackageHub;
     QStringList m_filesForDelayedDeletion;
 
     int m_status;
diff --git a/src/libs/installer/qinstallerglobal.h b/src/libs/installer/qinstallerglobal.h
index 5fb093eac..95a7c3d04 100644
--- a/src/libs/installer/qinstallerglobal.h
+++ b/src/libs/installer/qinstallerglobal.h
@@ -61,8 +61,7 @@ typedef QList<QInstaller::Operation*> OperationList;
 typedef KDUpdater::Update Package;
 typedef QList<QInstaller::Package*> PackagesList;
 
-typedef KDUpdater::PackageInfo LocalPackage;
-typedef QHash<QString, LocalPackage> LocalPackagesHash;
+typedef QHash<QString, KDUpdater::LocalPackage> LocalPackagesHash;
 
 } // namespace QInstaller
 
diff --git a/src/libs/kdtools/kdupdaterpackagesinfo.cpp b/src/libs/kdtools/kdupdaterpackagesinfo.cpp
index 68a0cf5f5..5aa3d9323 100644
--- a/src/libs/kdtools/kdupdaterpackagesinfo.cpp
+++ b/src/libs/kdtools/kdupdaterpackagesinfo.cpp
@@ -36,16 +36,16 @@
 #include "kdupdaterpackagesinfo.h"
 #include "globals.h"
 
+#include <QDomDocument>
+#include <QDomElement>
 #include <QFileInfo>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
 
 using namespace KDUpdater;
 
 /*!
     \inmodule kdupdater
-    \class KDUpdater::PackagesInfo
-    \brief The PackagesInfo class provides access to information about packages installed on the
+    \class KDUpdater::LocalPackageHub
+    \brief The LocalPackageHub class provides access to information about packages installed on the
         application side.
 
     This class parses the \e {installation information} XML file specified via the setFileName()
@@ -59,7 +59,7 @@ using namespace KDUpdater;
 */
 
 /*!
-    \enum PackagesInfo::Error
+    \enum LocalPackageHub::Error
     Error codes related to retrieving information about installed packages:
 
     \value NoError                          No error occurred.
@@ -73,61 +73,71 @@ using namespace KDUpdater;
                                             descriptions.
 */
 
-struct PackagesInfo::PackagesInfoData
+struct LocalPackageHub::PackagesInfoData
 {
     PackagesInfoData() :
-        error(PackagesInfo::NotYetReadError),
+        error(LocalPackageHub::NotYetReadError),
         modified(false)
     {}
     QString errorMessage;
-    PackagesInfo::Error error;
+    LocalPackageHub::Error error;
     QString fileName;
     QString applicationName;
     QString applicationVersion;
     bool modified;
 
-    QHash<QString, PackageInfo> m_packageInfoHash;
+    QHash<QString, LocalPackage> m_packageInfoHash;
 
     void addPackageFrom(const QDomElement &packageE);
     void setInvalidContentError(const QString &detail);
 };
 
-void PackagesInfo::PackagesInfoData::setInvalidContentError(const QString &detail)
+void LocalPackageHub::PackagesInfoData::setInvalidContentError(const QString &detail)
 {
-    error = PackagesInfo::InvalidContentError;
+    error = LocalPackageHub::InvalidContentError;
     errorMessage = tr("%1 contains invalid content: %2").arg(fileName, detail);
 }
 
 /*!
-   \internal
+    Constructs a local package hub. To fully setup the class you have to call setFileName().
+
+    \sa setFileName
 */
-PackagesInfo::PackagesInfo()
+LocalPackageHub::LocalPackageHub()
     : d(new PackagesInfoData())
 {
 }
 
 /*!
-   \internal
+    Destructor
 */
-PackagesInfo::~PackagesInfo()
+LocalPackageHub::~LocalPackageHub()
 {
     writeToDisk();
     delete d;
 }
 
 /*!
-    Returns \c true if PackagesInfo is valid; otherwise returns \c false. You
+    Returns \c true if LocalPackageHub is valid; otherwise returns \c false. You
     can use the errorString() method to receive a descriptive error message.
 */
-bool PackagesInfo::isValid() const
+bool LocalPackageHub::isValid() const
 {
     return d->error <= NotYetReadError;
 }
 
 /*!
+    Returns a list of all local installed packages.
+*/
+QStringList LocalPackageHub::packageNames() const
+{
+    return d->m_packageInfoHash.keys();
+}
+
+/*!
     Returns a human-readable description of the last error that occurred.
 */
-QString PackagesInfo::errorString() const
+QString LocalPackageHub::errorString() const
 {
     return d->errorMessage;
 }
@@ -136,7 +146,7 @@ QString PackagesInfo::errorString() const
     Returns the error that was found during the processing of the installation information XML file.
     If no error was found, returns NoError.
 */
-PackagesInfo::Error PackagesInfo::error() const
+LocalPackageHub::Error LocalPackageHub::error() const
 {
     return d->error;
 }
@@ -145,7 +155,7 @@ PackagesInfo::Error PackagesInfo::error() const
     Sets the complete file name of the installation information XML file to \a fileName. The function
     also issues a call to refresh() to reload installation information from the XML file.
 */
-void PackagesInfo::setFileName(const QString &fileName)
+void LocalPackageHub::setFileName(const QString &fileName)
 {
     if (d->fileName == fileName)
         return;
@@ -157,7 +167,7 @@ void PackagesInfo::setFileName(const QString &fileName)
 /*!
     Returns the name of the installation information XML file that this class refers to.
 */
-QString PackagesInfo::fileName() const
+QString LocalPackageHub::fileName() const
 {
     return d->fileName;
 }
@@ -166,7 +176,7 @@ QString PackagesInfo::fileName() const
     Sets the application name to \a name. By default, this is the name specified in the
     \c <ApplicationName> element of the installation information XML file.
 */
-void PackagesInfo::setApplicationName(const QString &name)
+void LocalPackageHub::setApplicationName(const QString &name)
 {
     d->applicationName = name;
 }
@@ -174,7 +184,7 @@ void PackagesInfo::setApplicationName(const QString &name)
 /*!
     Returns the application name.
 */
-QString PackagesInfo::applicationName() const
+QString LocalPackageHub::applicationName() const
 {
     return d->applicationName;
 }
@@ -183,7 +193,7 @@ QString PackagesInfo::applicationName() const
     Sets the application version to \a version. By default, this is the version specified in the
     \c <ApplicationVersion> element of the installation information XML file.
 */
-void PackagesInfo::setApplicationVersion(const QString &version)
+void LocalPackageHub::setApplicationVersion(const QString &version)
 {
     d->applicationVersion = version;
 }
@@ -191,15 +201,15 @@ void PackagesInfo::setApplicationVersion(const QString &version)
 /*!
     Returns the application version.
 */
-QString PackagesInfo::applicationVersion() const
+QString LocalPackageHub::applicationVersion() const
 {
     return d->applicationVersion;
 }
 
 /*!
-    Returns the number of KDUpdater::PackageInfo objects contained in this class.
+    Returns the number of KDUpdater::LocalPackage objects contained in this class.
 */
-int PackagesInfo::packageInfoCount() const
+int LocalPackageHub::packageInfoCount() const
 {
     return d->m_packageInfoHash.count();
 }
@@ -208,7 +218,7 @@ int PackagesInfo::packageInfoCount() const
     Returns the package info structure whose name is \a pkgName. If no such package was found, this
     function returns a \l{default-constructed value}.
 */
-PackageInfo PackagesInfo::packageInfo(const QString &pkgName) const
+LocalPackage LocalPackageHub::packageInfo(const QString &pkgName) const
 {
     return d->m_packageInfoHash.value(pkgName);
 }
@@ -216,7 +226,7 @@ PackageInfo PackagesInfo::packageInfo(const QString &pkgName) const
 /*!
     Returns all package info structures.
 */
-QList<PackageInfo> PackagesInfo::packageInfos() const
+QList<LocalPackage> LocalPackageHub::packageInfos() const
 {
     return d->m_packageInfoHash.values();
 }
@@ -226,7 +236,7 @@ QList<PackageInfo> PackagesInfo::packageInfos() const
     and applicationVersion() are lost after this function returns. The function emits a reset()
     signal after completion.
 */
-void PackagesInfo::refresh()
+void LocalPackageHub::refresh()
 {
     // First clear internal variables
     d->applicationName.clear();
@@ -302,7 +312,7 @@ void PackagesInfo::refresh()
     Returns \c true if the installation information was modified.
 
 */
-bool PackagesInfo::addPackage(const QString &name, const QString &version,
+bool LocalPackageHub::addPackage(const QString &name, const QString &version,
                                   const QString &title, const QString &description,
                                   const QStringList &dependencies, bool forcedInstallation,
                                   bool virtualComp, quint64 uncompressedSize,
@@ -314,7 +324,7 @@ bool PackagesInfo::addPackage(const QString &name, const QString &version,
         d->m_packageInfoHash[name].version = version;
         d->m_packageInfoHash[name].lastUpdateDate = QDate::currentDate();
     } else {
-        PackageInfo info;
+        LocalPackage info;
         info.name = name;
         info.version = version;
         info.inheritVersionFrom = inheritVersionFrom;
@@ -334,7 +344,7 @@ bool PackagesInfo::addPackage(const QString &name, const QString &version,
 /*!
     Removes the package specified by \a name. Returns \c false if the package is not found.
 */
-bool PackagesInfo::removePackage(const QString &name)
+bool LocalPackageHub::removePackage(const QString &name)
 {
     if (d->m_packageInfoHash.remove(name) <= 0)
         return false;
@@ -361,7 +371,7 @@ static void addTextChildHelper(QDomNode *node,
 /*!
     Writes the installation information file to disk.
 */
-void PackagesInfo::writeToDisk()
+void LocalPackageHub::writeToDisk()
 {
     if (d->modified && (!d->m_packageInfoHash.isEmpty() || QFile::exists(d->fileName))) {
         QDomDocument doc;
@@ -371,7 +381,7 @@ void PackagesInfo::writeToDisk()
         addTextChildHelper(&root, QLatin1String("ApplicationName"), d->applicationName);
         addTextChildHelper(&root, QLatin1String("ApplicationVersion"), d->applicationVersion);
 
-        Q_FOREACH (const PackageInfo &info, d->m_packageInfoHash) {
+        Q_FOREACH (const LocalPackage &info, d->m_packageInfoHash) {
             QDomElement package = doc.createElement(QLatin1String("Package"));
 
             addTextChildHelper(&package, QLatin1String("Name"), info.name);
@@ -414,7 +424,7 @@ void PackagesInfo::writeToDisk()
     }
 }
 
-void PackagesInfo::PackagesInfoData::addPackageFrom(const QDomElement &packageE)
+void LocalPackageHub::PackagesInfoData::addPackageFrom(const QDomElement &packageE)
 {
     if (packageE.isNull())
         return;
@@ -423,7 +433,7 @@ void PackagesInfo::PackagesInfoData::addPackageFrom(const QDomElement &packageE)
     if (childNodes.count() == 0)
         return;
 
-    PackageInfo info;
+    LocalPackage info;
     info.forcedInstallation = false;
     info.virtualComp = false;
     for (int i = 0; i < childNodes.count(); i++) {
@@ -464,7 +474,7 @@ void PackagesInfo::PackagesInfoData::addPackageFrom(const QDomElement &packageE)
 /*!
     Clears the installed package list.
 */
-void PackagesInfo::clearPackageInfoList()
+void LocalPackageHub::clearPackageInfos()
 {
     d->m_packageInfoHash.clear();
     d->modified = true;
@@ -472,8 +482,8 @@ void PackagesInfo::clearPackageInfoList()
 
 /*!
     \inmodule kdupdater
-    \class KDUpdater::PackageInfo
-    \brief The PackageInfo class describes a single installed package in the application.
+    \class KDUpdater::LocalPackage
+    \brief The LocalPackage class describes a single installed package in the application.
 
     This class contains information about a single installed package in the application. The
     information contained in this class corresponds to the information described by the <Package>
@@ -481,30 +491,30 @@ void PackagesInfo::clearPackageInfoList()
 */
 
 /*!
-    \variable PackageInfo::name
+    \variable LocalPackage::name
     \brief The name of the package.
 */
 
 /*!
-    \variable PackageInfo::pixmap
+    \variable LocalPackage::pixmap
 */
 
 /*!
-    \variable PackageInfo::title
+    \variable LocalPackage::title
 */
 
 /*!
-    \variable PackageInfo::description
+    \variable LocalPackage::description
 */
 
 /*!
-    \variable PackageInfo::version
+    \variable LocalPackage::version
 */
 
 /*!
-    \variable PackageInfo::lastUpdateDate
+    \variable LocalPackage::lastUpdateDate
 */
 
 /*!
-    \variable PackageInfo::installDate
+    \variable LocalPackage::installDate
 */
diff --git a/src/libs/kdtools/kdupdaterpackagesinfo.h b/src/libs/kdtools/kdupdaterpackagesinfo.h
index a2e9161fa..2a4e25863 100644
--- a/src/libs/kdtools/kdupdaterpackagesinfo.h
+++ b/src/libs/kdtools/kdupdaterpackagesinfo.h
@@ -44,7 +44,7 @@
 
 namespace KDUpdater {
 
-struct KDTOOLS_EXPORT PackageInfo
+struct KDTOOLS_EXPORT LocalPackage
 {
     QString name;
     QString pixmap;
@@ -61,14 +61,14 @@ struct KDTOOLS_EXPORT PackageInfo
     quint64 uncompressedSize;
 };
 
-class KDTOOLS_EXPORT PackagesInfo
+class KDTOOLS_EXPORT LocalPackageHub
 {
-    Q_DISABLE_COPY(PackagesInfo)
-    Q_DECLARE_TR_FUNCTIONS(PackagesInfo)
+    Q_DISABLE_COPY(LocalPackageHub)
+    Q_DECLARE_TR_FUNCTIONS(LocalPackageHub)
 
 public:
-    PackagesInfo();
-    ~PackagesInfo();
+    LocalPackageHub();
+    ~LocalPackageHub();
 
     enum Error
     {
@@ -80,6 +80,7 @@ public:
     };
 
     bool isValid() const;
+    QStringList packageNames() const;
 
     Error error() const;
     QString errorString() const;
@@ -93,11 +94,11 @@ public:
     QString applicationVersion() const;
     void setApplicationVersion(const QString &version);
 
-    void clearPackageInfoList();
+    void clearPackageInfos();
     int packageInfoCount() const;
 
-    QList<PackageInfo> packageInfos() const;
-    PackageInfo packageInfo(const QString &pkgName) const;
+    QList<LocalPackage> packageInfos() const;
+    LocalPackage packageInfo(const QString &pkgName) const;
 
     bool addPackage(const QString &pkgName, const QString &version, // mandatory
                     const QString &title = QString(),
diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp
index d57e59108..95c9b846b 100644
--- a/src/libs/kdtools/kdupdaterupdatefinder.cpp
+++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp
@@ -113,7 +113,7 @@ public:
     void slotDownloadDone();
 
     QSet<PackageSource> packageSources;
-    std::weak_ptr<PackagesInfo> m_packagesInfo;
+    std::weak_ptr<LocalPackageHub> m_localPackageHub;
 };
 
 
@@ -178,7 +178,7 @@ void UpdateFinder::Private::computeUpdates()
     cancel = false;
 
     // First do some quick sanity checks on the packages info
-    std::shared_ptr<PackagesInfo> packages = m_packagesInfo.lock();
+    std::shared_ptr<LocalPackageHub> packages = m_localPackageHub.lock();
     if (!packages) {
         q->reportError(tr("Could not access the package information of this application."));
         return;
@@ -364,7 +364,7 @@ QList<UpdateInfo> UpdateFinder::Private::applicableUpdates(UpdatesInfo *updatesI
     if (!updatesInfo || updatesInfo->updateInfoCount() == 0)
         return dummy;
 
-    std::shared_ptr<PackagesInfo> packages = m_packagesInfo.lock();
+    std::shared_ptr<LocalPackageHub> packages = m_localPackageHub.lock();
     if (!packages)
         return dummy;
 
@@ -474,9 +474,9 @@ QList<Update *> UpdateFinder::updates() const
     return d->updates.values();
 }
 
-void UpdateFinder::setPackagesInfo(std::weak_ptr<PackagesInfo> info)
+void UpdateFinder::setLocalPackageHub(std::weak_ptr<LocalPackageHub> hub)
 {
-    d->m_packagesInfo = std::move(info);
+    d->m_localPackageHub = std::move(hub);
 }
 
 /*!
diff --git a/src/libs/kdtools/kdupdaterupdatefinder.h b/src/libs/kdtools/kdupdaterupdatefinder.h
index 329cd54e6..5994bb685 100644
--- a/src/libs/kdtools/kdupdaterupdatefinder.h
+++ b/src/libs/kdtools/kdupdaterupdatefinder.h
@@ -43,7 +43,7 @@
 
 namespace KDUpdater {
 
-class PackagesInfo;
+class LocalPackageHub;
 class Update;
 
 class KDTOOLS_EXPORT UpdateFinder : public Task
@@ -57,7 +57,7 @@ public:
 
     QList<Update *> updates() const;
 
-    void setPackagesInfo(std::weak_ptr<PackagesInfo> info);
+    void setLocalPackageHub(std::weak_ptr<LocalPackageHub> hub);
     void setPackageSources(const QSet<QInstaller::PackageSource> &sources);
 
 private: