From ff63338d189a49a16b29a503ba23727cfa7e2e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 24 Sep 2018 17:03:23 +0200
Subject: Always build with a clean namespace QT_CLEAN_NAMESPACE constant is no
 more needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 src/kernel/ntqcursor.h              | 13 -------------
 src/kernel/ntqobjectdefs.h          |  6 ------
 src/kernel/ntqwindowdefs.h          |  6 ------
 src/kernel/qapplication_x11.cpp     |  3 ---
 src/kernel/qjpegio.cpp              |  4 ----
 src/kernel/qmngio.cpp               |  4 ----
 src/kernel/qsound_x11.cpp           |  2 --
 src/kernel/qtkdeintegration_x11.cpp |  1 -
 8 files changed, 39 deletions(-)

(limited to 'src/kernel')

diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h
index 70c91e95b..a285637cc 100644
--- a/src/kernel/ntqcursor.h
+++ b/src/kernel/ntqcursor.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 TQt::CursorShape TQCursorShape;
-#ifdef X_CursorShape
-#define CursorShape X_CursorShape
-#endif
-#endif
-
-
 /*****************************************************************************
   TQCursor stream functions
  *****************************************************************************/
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index a3c2ac4da..a8dce0707 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.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 TQMETHOD_CODE	0			// member type codes
 #define TQSLOT_CODE	1
 #define TQSIGNAL_CODE	2
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 54b18b656..6d57f2148 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -188,10 +188,4 @@ typedef void (*TQtCleanUpFunction)();
 Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction );
 Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction );
 
-#if !defined(QT_CLEAN_NAMESPACE)
-// source compatibility with TQt 2.x
-typedef TQtCleanUpFunction Q_CleanUpFunction;
-#endif
-
-
 #endif // TQWINDOWDEFS_H
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 8e859349c..08402bb1d 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/qjpegio.cpp b/src/kernel/qjpegio.cpp
index a6503fcba..037acad57 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 "ntqimage.h"
 
 #ifndef QT_NO_IMAGEIO_JPEG
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index a7ab00e0c..fa3f9bd5b 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 "ntqdatetime.h"
 
 #ifndef QT_NO_IMAGEIO_MNG
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 9c2a0dae3..01a2b86b0 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -38,8 +38,6 @@
 **
 **********************************************************************/
 
-#define QT_CLEAN_NAMESPACE
-
 #include "ntqsound.h"
 
 #ifndef QT_NO_SOUND
diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp
index b61920fcf..f49181f78 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 TQt library disribution */
 
-#define QT_CLEAN_NAMESPACE
 #include "qtkdeintegration_x11_p.h"
 
 #include <ntqcolordialog.h>
-- 
cgit v1.2.1