diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-10-31 13:07:43 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-11-18 16:17:12 +0100 |
commit | 6df883de4ae674a9b351f04e74c80bfa89d5faa6 (patch) | |
tree | 84e6ae2d596821412fb74a45bb8e5b88c9f12ecd | |
parent | a468b3612469d86dc2d54cb3cec1a55d667ea1e4 (diff) |
Expose real type of PackageManagerProxyFactory
This allows us to store proxy settings in the factory later on.
Change-Id: Ib389ccffb3163be4f5cd511be4c4b8bbe15e8a93
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
-rw-r--r-- | src/libs/installer/metadatajob.cpp | 1 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 4 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore.h | 9 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 4 | ||||
-rw-r--r-- | src/sdk/installerbase.cpp | 1 |
5 files changed, 9 insertions, 10 deletions
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp index 6ff2b0b3a..5e5a27416 100644 --- a/src/libs/installer/metadatajob.cpp +++ b/src/libs/installer/metadatajob.cpp @@ -35,6 +35,7 @@ #include "metadatajob_p.h" #include "packagemanagercore.h" +#include "packagemanagerproxyfactory.h" #include "productkeycheck.h" #include "settings.h" diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 7811f04ba..2303b2032 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -856,14 +856,14 @@ void PackageManagerCore::networkSettingsChanged() emit coreNetworkSettingsChanged(); } -KDUpdater::FileDownloaderProxyFactory *PackageManagerCore::proxyFactory() const +PackageManagerProxyFactory *PackageManagerCore::proxyFactory() const { if (d->m_proxyFactory) return d->m_proxyFactory->clone(); return new PackageManagerProxyFactory(this); } -void PackageManagerCore::setProxyFactory(KDUpdater::FileDownloaderProxyFactory *factory) +void PackageManagerCore::setProxyFactory(PackageManagerProxyFactory *factory) { delete d->m_proxyFactory; d->m_proxyFactory = factory; diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h index 7447127ab..10e39f0f8 100644 --- a/src/libs/installer/packagemanagercore.h +++ b/src/libs/installer/packagemanagercore.h @@ -43,16 +43,13 @@ #include <QtCore/QStringList> #include <QtCore/QVector> -namespace KDUpdater { - class FileDownloaderProxyFactory; -} - namespace QInstaller { class Component; class ComponentModel; class ScriptEngine; class PackageManagerCorePrivate; +class PackageManagerProxyFactory; class Settings; // -- PackageManagerCore @@ -122,8 +119,8 @@ public: LocalPackagesHash localInstalledPackages(); void networkSettingsChanged(); - KDUpdater::FileDownloaderProxyFactory *proxyFactory() const; - void setProxyFactory(KDUpdater::FileDownloaderProxyFactory *factory); + PackageManagerProxyFactory *proxyFactory() const; + void setProxyFactory(PackageManagerProxyFactory *factory); PackagesList remotePackages(); bool fetchRemotePackagesTree(); diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index 78aabebf1..ee92c3b1a 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -38,12 +38,12 @@ #include "metadatajob.h" #include "packagemanagercore.h" #include "packagemanagercoredata.h" +#include "packagemanagerproxyfactory.h" #include "qinstallerglobal.h" #include "remotefileengine.h" #include "kdsysinfo.h" #include "kdupdaterapplication.h" -#include "kdupdaterfiledownloaderfactory.h" #include "kdupdaterupdatefinder.h" #include <QObject> @@ -269,7 +269,7 @@ private: InstallerCalculator *m_installerCalculator; UninstallerCalculator *m_uninstallerCalculator; - FileDownloaderProxyFactory *m_proxyFactory; + PackageManagerProxyFactory *m_proxyFactory; ComponentModel *m_defaultModel; ComponentModel *m_updaterModel; diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 9df36b5a7..306b37223 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -45,6 +45,7 @@ #include <kdupdaterupdateoperations.h> #include <messageboxhandler.h> #include <packagemanagercore.h> +#include <packagemanagerproxyfactory.h> #include <qprocesswrapper.h> #include <productkeycheck.h> #include <settings.h> |