Always build with a clean namespace

QT_CLEAN_NAMESPACE constant is no more needed

This may theoretically affect applications created for Qt1 and Qt2,
but such applications require further modifications as well.

---------------------------

Cherry picked and adapted from commit ff63338d in tqt3 from Slávek Banko <slavek.banko@axis.cz>
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 0 insertions, 39 deletions

diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index c93c60f..a40ca02 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -44,9 +44,6 @@
 // provide a proper alternative for others. See also the exports in
 // qapplication_win.cpp which suggest a unification.
 
-// ### needed for solaris-g++ in beta5
-#define QT_CLEAN_NAMESPACE
-
 #include "qplatformdefs.h"
 
 // POSIX Large File Support redefines open -> open64
diff --git a/src/kernel/qcursor.h b/src/kernel/qcursor.h
index 9b99edb..7518cd3 100644
--- a/src/kernel/qcursor.h
+++ b/src/kernel/qcursor.h
@@ -122,19 +122,6 @@ private:
 };
 
 
-#if !defined(QT_CLEAN_NAMESPACE)
-// CursorShape is defined in X11/X.h
-#ifdef CursorShape
-#define X_CursorShape CursorShape
-#undef CursorShape
-#endif
-typedef Qt::CursorShape QCursorShape;
-#ifdef X_CursorShape
-#define CursorShape X_CursorShape
-#endif
-#endif
-
-
 /*****************************************************************************
   QCursor stream functions
  *****************************************************************************/
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index bdb4c27..e448cad 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -38,10 +38,6 @@
 **
 **********************************************************************/
 
-#ifndef QT_CLEAN_NAMESPACE
-#define QT_CLEAN_NAMESPACE
-#endif
-
 #include "qimage.h"
 
 #ifndef QT_NO_IMAGEIO_JPEG
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index d9d085b..76bf00c 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -38,10 +38,6 @@
 **
 **********************************************************************/
 
-#ifndef QT_CLEAN_NAMESPACE
-#define QT_CLEAN_NAMESPACE
-#endif
-
 #include "qdatetime.h"
 
 #ifndef QT_NO_IMAGEIO_MNG
diff --git a/src/kernel/qobjectdefs.h b/src/kernel/qobjectdefs.h
index cab0ec0..e0f31f6 100644
--- a/src/kernel/qobjectdefs.h
+++ b/src/kernel/qobjectdefs.h
@@ -142,12 +142,6 @@ private:								\
 #define SIGNAL(a)	"2"#a
 #endif
 
-#ifndef QT_CLEAN_NAMESPACE
-#define METHOD_CODE	0			// member type codes
-#define SLOT_CODE	1
-#define SIGNAL_CODE	2
-#endif
-
 #define QMETHOD_CODE	0			// member type codes
 #define QSLOT_CODE	1
 #define QSIGNAL_CODE	2
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 82639a4..edc5e34 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -38,8 +38,6 @@
 **
 **********************************************************************/
 
-#define QT_CLEAN_NAMESPACE
-
 #include "qsound.h"
 
 #ifndef QT_NO_SOUND
diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp
index a562a76..5fcd00f 100644
--- a/src/kernel/qtkdeintegration_x11.cpp
+++ b/src/kernel/qtkdeintegration_x11.cpp
@@ -1,7 +1,6 @@
 /* This file is licensed under the terms of the GPL v2 or v3, as it has been publicly released by
    OpenSUSE as part of their GPLed Qt library disribution */
 
-#define QT_CLEAN_NAMESPACE
 #include "qtkdeintegration_x11_p.h"
 
 #include <qcolordialog.h>
diff --git a/src/kernel/qwindowdefs.h b/src/kernel/qwindowdefs.h
index 05a3a33..1021696 100644
--- a/src/kernel/qwindowdefs.h
+++ b/src/kernel/qwindowdefs.h
@@ -188,10 +188,4 @@ typedef void (*QtCleanUpFunction)();
 Q_EXPORT void qAddPostRoutine( QtCleanUpFunction );
 Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction );
 
-#if !defined(QT_CLEAN_NAMESPACE)
-// source compatibility with Qt 2.x
-typedef QtCleanUpFunction Q_CleanUpFunction;
-#endif
-
-
 #endif // QWINDOWDEFS_H