From 26e4af07b19135db61919dfaab9243f17d328f50 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Wed, 10 Sep 2014 12:33:21 +0200
Subject: Move ProductKeyCheck out of QInstaller namespace

Commit 77b1e168202e moved ProductKeyCheck into the QInstaller namespace.
This causes problems in the commercial license checker that has to support
both 1.6 and master.

Change-Id: Ifcf6548ebdfaac65a1dccdc179239a28c90c6fe9
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
---
 src/libs/installer/productkeycheck.cpp | 4 ----
 src/libs/installer/productkeycheck.h   | 9 ++++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/libs/installer/productkeycheck.cpp b/src/libs/installer/productkeycheck.cpp
index e86ef77ff..5d663d6bd 100644
--- a/src/libs/installer/productkeycheck.cpp
+++ b/src/libs/installer/productkeycheck.cpp
@@ -35,8 +35,6 @@
 #include "productkeycheck.h"
 #include "packagemanagercore.h"
 
-namespace QInstaller {
-
 class ProductKeyCheckPrivate
 {
 };
@@ -109,5 +107,3 @@ QList<int> ProductKeyCheck::registeredPages() const
 {
     return QList<int>();
 }
-
-} // namespace QInstaller
diff --git a/src/libs/installer/productkeycheck.h b/src/libs/installer/productkeycheck.h
index 3b0ceb086..db8a6a8d6 100644
--- a/src/libs/installer/productkeycheck.h
+++ b/src/libs/installer/productkeycheck.h
@@ -42,9 +42,10 @@
 namespace QInstaller {
 
 class PackageManagerCore;
-class ProductKeyCheckPrivate;
 class Repository;
 
+} // QInstaller
+
 class INSTALLER_EXPORT ProductKeyCheck
 {
     Q_DISABLE_COPY(ProductKeyCheck)
@@ -52,7 +53,7 @@ class INSTALLER_EXPORT ProductKeyCheck
 public:
     ~ProductKeyCheck();
     static ProductKeyCheck *instance();
-    void init(PackageManagerCore *core);
+    void init(QInstaller::PackageManagerCore *core);
 
     // was validLicense
     bool hasValidKey();
@@ -75,9 +76,7 @@ public:
 
 private:
     ProductKeyCheck();
-    ProductKeyCheckPrivate *const d;
+    class ProductKeyCheckPrivate *const d;
 };
 
-} // namespace QInstaller
-
 #endif // PRODUCTKEYCHECK_H
-- 
cgit v1.2.3