Fix stupid mistake to use a private class in public API.

Also a preparation the be able to implement the next commit.

Change-Id: Iaeba54e5c1cfe97178e28fcc3fe72f9623f10bc6
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

7 files changed, 37 insertions, 31 deletions

diff --git a/src/libs/installer/getrepositoriesmetainfojob.cpp b/src/libs/installer/getrepositoriesmetainfojob.cpp
index 99b7e4340..98840b6b0 100644
--- a/src/libs/installer/getrepositoriesmetainfojob.cpp
+++ b/src/libs/installer/getrepositoriesmetainfojob.cpp
@@ -52,12 +52,12 @@ using namespace QInstaller;
 
 // -- GetRepositoriesMetaInfoJob
 
-GetRepositoriesMetaInfoJob::GetRepositoriesMetaInfoJob(PackageManagerCorePrivate *corePrivate)
-    : KDJob(corePrivate)
+GetRepositoriesMetaInfoJob::GetRepositoriesMetaInfoJob(PackageManagerCore *core)
+    : KDJob(core)
     , m_canceled(false)
     , m_silentRetries(3)
     , m_haveIgnoredError(false)
-    , m_corePrivate(corePrivate)
+    , m_core(core)
 {
     setCapabilities(Cancelable);
 }
@@ -118,9 +118,9 @@ bool GetRepositoriesMetaInfoJob::isCanceled() const
 
 void GetRepositoriesMetaInfoJob::doStart()
 {
-    if ((m_corePrivate->isInstaller() && !m_corePrivate->isOfflineOnly())
-        || (m_corePrivate->isUpdater() || m_corePrivate->isPackageManager())) {
-            foreach (const Repository &repo, m_corePrivate->m_data.settings().repositories()) {
+    if ((m_core->isInstaller() && !m_core->isOfflineOnly()) || (m_core->isUpdater()
+        || m_core->isPackageManager())) {
+            foreach (const Repository &repo, m_core->settings().repositories()) {
                 if (repo.isEnabled())
                     m_repositories += repo;
             }
@@ -156,7 +156,7 @@ void GetRepositoriesMetaInfoJob::fetchNextRepo()
         return;
     }
 
-    m_job = new GetRepositoryMetaInfoJob(m_corePrivate, this);
+    m_job = new GetRepositoryMetaInfoJob(m_core, this);
     connect(m_job, SIGNAL(finished(KDJob*)), this, SLOT(jobFinished(KDJob*)));
     connect(m_job, SIGNAL(infoMessage(KDJob*, QString)), this, SIGNAL(infoMessage(KDJob*, QString)));
 
diff --git a/src/libs/installer/getrepositoriesmetainfojob.h b/src/libs/installer/getrepositoriesmetainfojob.h
index aa381e3a4..2cc53b82a 100644
--- a/src/libs/installer/getrepositoriesmetainfojob.h
+++ b/src/libs/installer/getrepositoriesmetainfojob.h
@@ -59,14 +59,14 @@ namespace KDUpdater {
 namespace QInstaller {
 
 class GetRepositoryMetaInfoJob;
-class PackageManagerCorePrivate;
+class PackageManagerCore;
 
 class INSTALLER_EXPORT GetRepositoriesMetaInfoJob : public KDJob
 {
     Q_OBJECT
 
 public:
-    explicit GetRepositoriesMetaInfoJob(PackageManagerCorePrivate *corePrivate);
+    explicit GetRepositoriesMetaInfoJob(PackageManagerCore *core);
 
     QStringList temporaryDirectories() const;
     QStringList releaseTemporaryDirectories() const;
@@ -91,7 +91,7 @@ private:
     bool m_canceled;
     int m_silentRetries;
     bool m_haveIgnoredError;
-    PackageManagerCorePrivate *m_corePrivate;
+    PackageManagerCore *m_core;
 
     QString m_errorString;
     QList<Repository> m_repositories;
diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp
index 6913a63e5..1c8d07525 100644
--- a/src/libs/installer/getrepositorymetainfojob.cpp
+++ b/src/libs/installer/getrepositorymetainfojob.cpp
@@ -111,14 +111,14 @@ private:
 
 // -- GetRepositoryMetaInfoJob
 
-GetRepositoryMetaInfoJob::GetRepositoryMetaInfoJob(PackageManagerCorePrivate *corePrivate, QObject *parent)
+GetRepositoryMetaInfoJob::GetRepositoryMetaInfoJob(PackageManagerCore *core, QObject *parent)
     : KDJob(parent)
     , m_canceled(false)
     , m_silentRetries(4)
     , m_retriesLeft(m_silentRetries)
     , m_downloader(0)
     , m_waitForDone(false)
-    , m_corePrivate(corePrivate)
+    , m_core(core)
 {
     setCapabilities(Cancelable);
 }
@@ -331,12 +331,11 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
         }
 
         if (!repositoryUpdates.isEmpty()) {
-            if (m_corePrivate->m_data.settings().updateDefaultRepositories(repositoryUpdates)
-                == Settings::UpdatesApplied) {
-                    if (m_corePrivate->isUpdater() || m_corePrivate->isPackageManager())
-                        m_corePrivate->writeMaintenanceConfigFiles();
-                    finished(QInstaller::RepositoryUpdatesReceived, tr("Repository updates received."));
-                    return;
+            if (m_core->settings().updateDefaultRepositories(repositoryUpdates) == Settings::UpdatesApplied) {
+                if (m_core->isUpdater() || m_core->isPackageManager())
+                    m_core->writeMaintenanceConfigFiles();
+                finished(QInstaller::RepositoryUpdatesReceived, tr("Repository updates received."));
+                return;
             }
         }
     }
@@ -538,26 +537,26 @@ void GetRepositoryMetaInfoJob::onAuthenticatorChanged(const QAuthenticator &auth
     const QString username = authenticator.user();
     const QString password = authenticator.password();
     if (username != m_repository.username() || password != m_repository.password()) {
-        QSet<Repository> repositories = m_corePrivate->m_data.settings().defaultRepositories();
+        QSet<Repository> repositories = m_core->settings().defaultRepositories();
         bool reposChanged = updateRepositories(&repositories, username, password);
         if (reposChanged)
-            m_corePrivate->m_data.settings().setDefaultRepositories(repositories);
+            m_core->settings().setDefaultRepositories(repositories);
 
-        repositories = m_corePrivate->m_data.settings().temporaryRepositories();
+        repositories = m_core->settings().temporaryRepositories();
         reposChanged |= updateRepositories(&repositories, username, password);
         if (reposChanged) {
-            m_corePrivate->m_data.settings().setTemporaryRepositories(repositories,
-            m_corePrivate->m_data.settings().hasReplacementRepos());
+            m_core->settings().setTemporaryRepositories(repositories,
+            m_core->settings().hasReplacementRepos());
         }
 
-        repositories = m_corePrivate->m_data.settings().userRepositories();
+        repositories = m_core->settings().userRepositories();
         reposChanged |= updateRepositories(&repositories, username, password);
         if (reposChanged)
-            m_corePrivate->m_data.settings().setUserRepositories(repositories);
+            m_core->settings().setUserRepositories(repositories);
 
         if (reposChanged) {
-            if (m_corePrivate->isUpdater() || m_corePrivate->isPackageManager())
-                m_corePrivate->writeMaintenanceConfigFiles();
+            if (m_core->isUpdater() || m_core->isPackageManager())
+                m_core->writeMaintenanceConfigFiles();
             finished(QInstaller::RepositoryUpdatesReceived, tr("Repository updates received."));
         }
     }
diff --git a/src/libs/installer/getrepositorymetainfojob.h b/src/libs/installer/getrepositorymetainfojob.h
index 8601742a2..803f8b43f 100644
--- a/src/libs/installer/getrepositorymetainfojob.h
+++ b/src/libs/installer/getrepositorymetainfojob.h
@@ -61,7 +61,7 @@ namespace KDUpdater {
 namespace QInstaller {
 
 class GetRepositoriesMetaInfoJob;
-class PackageManagerCorePrivate;
+class PackageManagerCore;
 
 class INSTALLER_EXPORT GetRepositoryMetaInfoJob : public KDJob
 {
@@ -70,7 +70,7 @@ class INSTALLER_EXPORT GetRepositoryMetaInfoJob : public KDJob
     friend class QInstaller::GetRepositoriesMetaInfoJob;
 
 public:
-    explicit GetRepositoryMetaInfoJob(PackageManagerCorePrivate *corePrivate, QObject *parent = 0);
+    explicit GetRepositoryMetaInfoJob(PackageManagerCore *core, QObject *parent = 0);
     ~GetRepositoryMetaInfoJob();
 
     Repository repository() const;
@@ -119,7 +119,7 @@ private:
 
     bool m_waitForDone;
     QThreadPool m_threadPool;
-    PackageManagerCorePrivate *m_corePrivate;
+    PackageManagerCore *m_core;
 };
 
 }   // namespace QInstaller
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 92f8ea26c..3030777f8 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -413,6 +413,11 @@ void PackageManagerCore::writeUninstaller()
     }
 }
 
+void PackageManagerCore::writeMaintenanceConfigFiles()
+{
+    d->writeMaintenanceConfigFiles();
+}
+
 void PackageManagerCore::reset(const QHash<QString, QString> &params)
 {
     d->m_completeUninstall = false;
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index 218d9f6a9..24fbc4d64 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -157,6 +157,8 @@ public:
     QStringList replaceVariables(const QStringList &str) const;
 
     void writeUninstaller();
+    void writeMaintenanceConfigFiles();
+
     QString uninstallerName() const;
     QString installerBinaryPath() const;
 
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 17b7560aa..a840d6d1e 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -632,7 +632,7 @@ void PackageManagerCorePrivate::initialize(const QHash<QString, QString> &params
     }
 
     if (!m_repoMetaInfoJob) {
-        m_repoMetaInfoJob = new GetRepositoriesMetaInfoJob(this);
+        m_repoMetaInfoJob = new GetRepositoriesMetaInfoJob(m_core);
         m_repoMetaInfoJob->setAutoDelete(false);
         connect(m_repoMetaInfoJob, SIGNAL(infoMessage(KDJob*, QString)), this, SLOT(infoMessage(KDJob*,
             QString)));