Make it compile with "namespaced" Qt.

Reviewed-by: Tim Jenssen

28 files changed, 68 insertions, 15 deletions

diff --git a/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp b/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp
index f1dd2e439..a048fafbe 100644
--- a/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp
+++ b/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.cpp
@@ -24,14 +24,13 @@
 #include "7zip/UI/Common/Extract.h"
 #include "7zip/UI/Common/Update.h"
 #include "7zip/UI/Common/ArchiveExtractCallback.h"
+#include "7zip/UI/Common/LoadCodecs.h"
+#include "7zip/UI/Common/PropIDUtils.h"
 
 #include "Windows/Defs.h"
 #include "Windows/Error.h"
 #include "Windows/FileDir.h"
 #include "Windows/FileName.h"
-
-#include "7zip/UI/Common/LoadCodecs.h"
-#include "7zip/UI/Common/PropIDUtils.h"
 #include "Windows/PropVariant.h"
 #include "Windows/PropVariantConversions.h"
 
diff --git a/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.h b/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.h
index 670071866..2441e3d35 100644
--- a/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.h
+++ b/installerbuilder/libinstaller/3rdparty/p7zip_9.04/lib7z_facade.h
@@ -17,8 +17,10 @@
 
 #include "../../installerbuilder/libinstaller/installer_global.h"
 
+QT_BEGIN_NAMESPACE
 class QStringList;
 template <typename T> class QVector;
+QT_END_NAMESPACE
 
 namespace Lib7z {
 
diff --git a/installerbuilder/libinstaller/fsengineclient.h b/installerbuilder/libinstaller/fsengineclient.h
index 9065f3741..c84cb673e 100644
--- a/installerbuilder/libinstaller/fsengineclient.h
+++ b/installerbuilder/libinstaller/fsengineclient.h
@@ -32,9 +32,13 @@
 
 #ifdef FSENGINE_TCP
 #include <QtNetwork/QHostAddress>
+QT_BEGIN_NAMESPACE
 class QTcpSocket;
+QT_END_NAMESPACE
 #else
+QT_BEGIN_NAMESPACE
 class QLocalSocket;
+QT_END_NAMESPACE
 #endif
 
 #include "installer_global.h"
diff --git a/installerbuilder/libinstaller/globalsettingsoperation.h b/installerbuilder/libinstaller/globalsettingsoperation.h
index a8eab3473..693273d39 100644
--- a/installerbuilder/libinstaller/globalsettingsoperation.h
+++ b/installerbuilder/libinstaller/globalsettingsoperation.h
@@ -29,7 +29,6 @@
 #include <KDUpdater/UpdateOperation>
 
 class QSettingsWrapper;
-class QStringList;
 
 namespace QInstaller {
 
diff --git a/installerbuilder/libinstaller/installationprogressdialog.h b/installerbuilder/libinstaller/installationprogressdialog.h
index 5523b28f3..712a7794a 100644
--- a/installerbuilder/libinstaller/installationprogressdialog.h
+++ b/installerbuilder/libinstaller/installationprogressdialog.h
@@ -28,26 +28,34 @@
 
 #include <QtGui/QDialog>
 
+QT_BEGIN_NAMESPACE
 class QDialogButtonBox;
+QT_END_NAMESPACE
 
 namespace QInstaller {
 
 class PerformInstallationForm;
 
-class InstallationProgressDialog : public QDialog{
+class InstallationProgressDialog : public QDialog
+{
     Q_OBJECT
+
 public:
     explicit InstallationProgressDialog( QWidget* parent=0 );
     ~InstallationProgressDialog();
     //bool isShowingDetails() const;
+
 Q_SIGNALS:
     void canceled();
 
 private Q_SLOTS:
     void finished();
+
 private:
     PerformInstallationForm *m_performInstallationForm;
     QDialogButtonBox* m_dialogBtns;
 };
-} //namespace QInstaller
+
+} // namespace QInstaller
+
 #endif
diff --git a/installerbuilder/libinstaller/kdmmappedfileiodevice.h b/installerbuilder/libinstaller/kdmmappedfileiodevice.h
index 06aa18819..d4c5e51d5 100644
--- a/installerbuilder/libinstaller/kdmmappedfileiodevice.h
+++ b/installerbuilder/libinstaller/kdmmappedfileiodevice.h
@@ -30,10 +30,14 @@
 
 #include "installer_global.h"
 
+QT_BEGIN_NAMESPACE
 class QFile;
+QT_END_NAMESPACE
 
-class INSTALLER_EXPORT KDMMappedFileIODevice : public QIODevice {
+class INSTALLER_EXPORT KDMMappedFileIODevice : public QIODevice
+{
     Q_OBJECT
+
 public:
     KDMMappedFileIODevice( QFile* file, qint64 offset, qint64 length, QObject* parent=0 );
     KDMMappedFileIODevice( const QString& filename, qint64 offset, qint64 length, QObject* parent=0 );
diff --git a/installerbuilder/libinstaller/kdtools/KDToolsCore/kdbytesize.h b/installerbuilder/libinstaller/kdtools/KDToolsCore/kdbytesize.h
index cc8f5a770..d5735632c 100644
--- a/installerbuilder/libinstaller/kdtools/KDToolsCore/kdbytesize.h
+++ b/installerbuilder/libinstaller/kdtools/KDToolsCore/kdbytesize.h
@@ -45,7 +45,10 @@ KDTOOLSCORE_EXPORT KDByteSize operator*( const KDByteSize& lhs, int rhs );
 
 KDTOOLS_MAKE_RELATION_OPERATORS( KDByteSize, static inline )
 
+QT_BEGIN_NAMESPACE
 class QDebug;
+QT_END_NAMESPACE
+
 KDTOOLSCORE_EXPORT QDebug operator<<( QDebug dbg, const KDByteSize& size );
 
 #endif
diff --git a/installerbuilder/libinstaller/kdtools/KDToolsCore/kdlockfile.h b/installerbuilder/libinstaller/kdtools/KDToolsCore/kdlockfile.h
index cecbc5cbd..3334f385f 100644
--- a/installerbuilder/libinstaller/kdtools/KDToolsCore/kdlockfile.h
+++ b/installerbuilder/libinstaller/kdtools/KDToolsCore/kdlockfile.h
@@ -25,7 +25,9 @@
 
 #include <pimpl_ptr.h>
 
+QT_BEGIN_NAMESPACE
 class QString;
+QT_END_NAMESPACE
 
 class KDTOOLSCORE_EXPORT KDLockFile
 {
diff --git a/installerbuilder/libinstaller/kdtools/KDToolsCore/kdsysinfo.h b/installerbuilder/libinstaller/kdtools/KDToolsCore/kdsysinfo.h
index 2324ccfc8..44d1cc71d 100644
--- a/installerbuilder/libinstaller/kdtools/KDToolsCore/kdsysinfo.h
+++ b/installerbuilder/libinstaller/kdtools/KDToolsCore/kdsysinfo.h
@@ -106,7 +106,9 @@ public:
     static QList< ProcessInfo > runningProcesses();
 };
 
+QT_BEGIN_NAMESPACE
 class QDebug;
+QT_END_NAMESPACE
 
 QDebug operator<<( QDebug dbg, KDSysInfo::OperatingSystemType type );
 QDebug operator<<( QDebug dbg, KDSysInfo::ArchitectureType type );
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/environment.h b/installerbuilder/libinstaller/kdtools/KDUpdater/environment.h
index 001afbbc2..7d6169314 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/environment.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/environment.h
@@ -5,8 +5,10 @@
 
 #include <QString>
 
+QT_BEGIN_NAMESPACE
 class QProcess;
 class QProcessEnvironment;
+QT_END_NAMESPACE
 
 namespace KDUpdater {
 
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterapplication.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterapplication.h
index 3970236d3..1d0fca6d9 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterapplication.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterapplication.h
@@ -26,7 +26,9 @@
 #include "kdupdater.h"
 #include <QObject>
 
+QT_BEGIN_NAMESPACE
 class QUrl;
+QT_END_NAMESPACE
 
 namespace KDUpdater
 {
@@ -34,7 +36,8 @@ namespace KDUpdater
     class SignatureVerifier;
     class UpdateSourcesInfo;
 
-    class ConfigurationInterface {
+    class ConfigurationInterface
+    {
     public:
         virtual ~ConfigurationInterface();
         virtual QVariant value( const QString& key ) const = 0;
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatercrypto.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatercrypto.h
index 15d0011a0..4d94c89fb 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatercrypto.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatercrypto.h
@@ -25,10 +25,12 @@
 
 #include "kdupdater.h"
 
+#include <KDToolsCore/pimpl_ptr.h>
+
+QT_BEGIN_NAMESPACE
 class QByteArray;
 class QIODevice;
-
-#include <KDToolsCore/pimpl_ptr.h>
+QT_END_NAMESPACE
 
 /**
  * Class that provides cryptographic functionality like signing and verifying
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloader_p.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloader_p.h
index 516bc3c3d..841e48c03 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloader_p.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloader_p.h
@@ -29,7 +29,9 @@
 #include <QtCore/QCryptographicHash>
 #include <QtNetwork/QNetworkReply>
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
 
 // these classes are not a part of the public API
 
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h
index b4c284640..7afc3e35e 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterfiledownloaderfactory.h
@@ -30,7 +30,9 @@
 #include <QtCore/QStringList>
 #include <QtCore/QUrl>
 
+QT_BEGIN_NAMESPACE
 class QObject;
+QT_END_NAMESPACE
 
 namespace KDUpdater
 {
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationresult.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationresult.h
index 5319d35f3..6d426c820 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationresult.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationresult.h
@@ -28,7 +28,9 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QSharedDataPointer>
 
+QT_BEGIN_NAMESPACE
 class QString;
+QT_END_NAMESPACE
 
 namespace KDUpdater {
     class KDTOOLS_UPDATER_EXPORT SignatureVerificationResult {
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h
index afc201bea..bbad15381 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverificationrunnable.h
@@ -27,10 +27,12 @@
 #include <QtCore/QGenericArgument>
 #include <QtCore/QRunnable>
 
+QT_BEGIN_NAMESPACE
 class QByteArray;
 class QIODevice;
 class QObject;
 template <typename T> class QVector;
+QT_END_NAMESPACE
 
 namespace KDUpdater {
     class SignatureVerifier;
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverifier.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverifier.h
index dfb8cbddb..ef1da8ae3 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverifier.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdatersignatureverifier.h
@@ -25,9 +25,11 @@
 
 #include "kdupdater.h"
 
+QT_BEGIN_NAMESPACE
 class QByteArray;
 class QIODevice;
 class QString;
+QT_END_NAMESPACE
 
 namespace KDUpdater {
 
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h
index 65f6ea5cb..6501735f1 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufcompresscommon_p.h
@@ -31,8 +31,10 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QVector>
 
+QT_BEGIN_NAMESPACE
 class QCryptographicHash;
 class QDataStream;
+QT_END_NAMESPACE
 
 namespace KDUpdater
 {
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufuncompressor_p.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufuncompressor_p.h
index 5800887fc..61c5cca78 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufuncompressor_p.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterufuncompressor_p.h
@@ -27,7 +27,9 @@
 
 #include <QtCore/QCoreApplication>
 
+QT_BEGIN_NAMESPACE
 class QString;
+QT_END_NAMESPACE
 
 namespace KDUpdater
 {
diff --git a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterupdatefinder.h b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterupdatefinder.h
index 14ebb9c97..e472f42e0 100644
--- a/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterupdatefinder.h
+++ b/installerbuilder/libinstaller/kdtools/KDUpdater/kdupdaterupdatefinder.h
@@ -28,7 +28,9 @@
 #include <QList>
 #include <QMap>
 
+QT_BEGIN_NAMESPACE
 class QUrl;
+QT_END_NAMESPACE
 
 namespace KDUpdater
 {
diff --git a/installerbuilder/libinstaller/messageboxhandler.h b/installerbuilder/libinstaller/messageboxhandler.h
index 43e4ac93d..e591e6490 100644
--- a/installerbuilder/libinstaller/messageboxhandler.h
+++ b/installerbuilder/libinstaller/messageboxhandler.h
@@ -33,8 +33,6 @@
 #include <QMessageBox>
 #include <QHash>
 
-class QString;
-
 namespace QInstaller {
 
 QScriptValue registerMessageBox( QScriptEngine* scriptEngine );
diff --git a/installerbuilder/libinstaller/performinstallationform.h b/installerbuilder/libinstaller/performinstallationform.h
index 35f894a46..9a17fa73a 100644
--- a/installerbuilder/libinstaller/performinstallationform.h
+++ b/installerbuilder/libinstaller/performinstallationform.h
@@ -30,11 +30,13 @@
 
 class LazyPlainTextEdit;
 
+QT_BEGIN_NAMESPACE
 class QWidget;
 class QPushButton;
 class QProgressBar;
 class QLabel;
 class QTimer;
+QT_END_NAMESPACE
 
 namespace QInstaller {
 
diff --git a/installerbuilder/libinstaller/progresscoordinator.cpp b/installerbuilder/libinstaller/progresscoordinator.cpp
index e0cc9ff1f..a38086a13 100644
--- a/installerbuilder/libinstaller/progresscoordinator.cpp
+++ b/installerbuilder/libinstaller/progresscoordinator.cpp
@@ -37,11 +37,12 @@
 
 using namespace QInstaller;
 
+QT_BEGIN_NAMESPACE
 uint qHash(QPointer<QObject> key)
 {
     return qHash(key.data());
 }
-
+QT_END_NAMESPACE
 
 ProgressCoordninator::ProgressCoordninator(QObject *parent) :
     QObject(parent),
diff --git a/installerbuilder/libinstaller/qinstaller.h b/installerbuilder/libinstaller/qinstaller.h
index 1cb1afd4e..c965b037f 100644
--- a/installerbuilder/libinstaller/qinstaller.h
+++ b/installerbuilder/libinstaller/qinstaller.h
@@ -48,9 +48,11 @@ namespace KDUpdater {
     class UpdateOperation;
 }
 
+QT_BEGIN_NAMESPACE
 class QDir;
 class QFile;
 class QIODevice;
+QT_END_NAMESPACE
 
 class KDJob;
 
diff --git a/installerbuilder/libinstaller/qinstallercomponent.h b/installerbuilder/libinstaller/qinstallercomponent.h
index 09ce10f44..45edf8902 100644
--- a/installerbuilder/libinstaller/qinstallercomponent.h
+++ b/installerbuilder/libinstaller/qinstallercomponent.h
@@ -32,8 +32,6 @@
 
 #include "qinstaller.h" // friend QInstaller::Private
 
-class QDir;
-
 namespace KDUpdater {
     class Update;
     class UpdateOperation;
diff --git a/installerbuilder/libinstaller/qinstallerglobal.h b/installerbuilder/libinstaller/qinstallerglobal.h
index ac966e81d..06f4975a6 100644
--- a/installerbuilder/libinstaller/qinstallerglobal.h
+++ b/installerbuilder/libinstaller/qinstallerglobal.h
@@ -31,12 +31,14 @@
 #include <QtGlobal>
 #include <qnamespace.h>
 
+QT_BEGIN_NAMESPACE
 class QIODevice;
 class QFile;
 template <typename T> class QList;
 class QScriptContext;
 class QScriptEngine;
 class QScriptValue;
+QT_END_NAMESPACE
 
 namespace QInstaller {
 
diff --git a/installerbuilder/libinstaller/qinstallergui.h b/installerbuilder/libinstaller/qinstallergui.h
index fb35d1850..72d3197e8 100644
--- a/installerbuilder/libinstaller/qinstallergui.h
+++ b/installerbuilder/libinstaller/qinstallergui.h
@@ -35,6 +35,7 @@
 #include "messageboxhandler.h"
 
 // FIXME: move to private classes
+QT_BEGIN_NAMESPACE
 class QCheckBox;
 class QLabel;
 class QLineEdit;
@@ -45,6 +46,7 @@ class QRadioButton;
 class QTextBrowser;
 class QTreeView;
 class QScriptEngine;
+QT_END_NAMESPACE
 
 namespace QInstaller {
 
diff --git a/installerbuilder/libinstaller/updatesettings.h b/installerbuilder/libinstaller/updatesettings.h
index 4ba31be7f..9031c63bb 100644
--- a/installerbuilder/libinstaller/updatesettings.h
+++ b/installerbuilder/libinstaller/updatesettings.h
@@ -30,10 +30,12 @@
 
 #include "installer_global.h"
 
+QT_BEGIN_NAMESPACE
 class QDateTime;
 template< typename T >
 class QList;
 class QSettings;
+QT_END_NAMESPACE
 
 namespace QInstaller
 {