summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-07-25 09:34:14 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-07-25 09:34:14 +0200
commit2f961a11ae27d7e49ab5a3bfc0719305f1132fdb (patch)
tree33dfbb3c8a08b631a9b44a03f1de8bf8ff061771
parent7f5f8285850bf5f006761f37d3c692e3a9bd0744 (diff)
Revert "remove unused constructors" <- they were used
This reverts commit cd68da35965e07f96dff244cf85a0e3908ee5621.
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.cpp9
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.h1
-rw-r--r--installerbuilder/libinstaller/packagemanagercore_p.cpp11
-rw-r--r--installerbuilder/libinstaller/packagemanagercore_p.h1
4 files changed, 22 insertions, 0 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index ce247bd5b..b32d8db2a 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -566,6 +566,15 @@ bool PackageManagerCore::isFileExtensionRegistered(const QString& extension) con
// -- QInstaller
+/*!
+ Used by operation runner to get a fake installer, can be removed if installerbase can do what operation
+ runner does.
+*/
+PackageManagerCore::PackageManagerCore()
+ : d(new PackageManagerCorePrivate(this))
+{
+}
+
PackageManagerCore::PackageManagerCore(qint64 magicmaker, const OperationList &performedOperations)
: d(new PackageManagerCorePrivate(this, magicmaker, performedOperations))
{
diff --git a/installerbuilder/libinstaller/packagemanagercore.h b/installerbuilder/libinstaller/packagemanagercore.h
index e95bdb258..4b019217e 100644
--- a/installerbuilder/libinstaller/packagemanagercore.h
+++ b/installerbuilder/libinstaller/packagemanagercore.h
@@ -49,6 +49,7 @@ class INSTALLER_EXPORT PackageManagerCore : public QObject
Q_PROPERTY(int status READ status NOTIFY statusChanged)
public:
+ explicit PackageManagerCore();
explicit PackageManagerCore(qint64 magicmaker, const OperationList &oldOperations = OperationList());
~PackageManagerCore();
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp
index 9e93c5e34..264205522 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -149,6 +149,17 @@ static void deferredRename(const QString &oldName, const QString &newName, bool
// -- PackageManagerCorePrivate
+PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core)
+ : m_updateFinder(0)
+ , m_FSEngineClientHandler(0)
+ , m_core(core)
+ , m_repoMetaInfoJob(0)
+ , m_updates(false)
+ , m_repoFetched(false)
+ , m_updateSourcesAdded(false)
+{
+}
+
PackageManagerCorePrivate::PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
const OperationList &performedOperations)
: m_updateFinder(0)
diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h
index 93624fbef..86ec0874d 100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.h
+++ b/installerbuilder/libinstaller/packagemanagercore_p.h
@@ -79,6 +79,7 @@ public:
};
+ explicit PackageManagerCorePrivate(PackageManagerCore *core);
explicit PackageManagerCorePrivate(PackageManagerCore *core, qint64 magicInstallerMaker,
const OperationList &performedOperations);
~PackageManagerCorePrivate();