From 0911b4d0ca95e61f5f0fff6b48f08974f3cbe809 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 25 Sep 2018 01:20:41 +0900
Subject: Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kcontrol/energy/energy.cpp | 4 ----
 ksmserver/client.h         | 2 --
 ksmserver/server.h         | 2 --
 kstart/Makefile.am         | 2 +-
 twin/group.cpp             | 2 --
 twin/killwindow.cpp        | 3 ---
 twin/main.cpp              | 1 -
 twin/popupinfo.cpp         | 1 -
 twin/tabbox.cpp            | 1 -
 twin/workspace.cpp         | 2 --
 10 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 5129e365d..60be2cc1f 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -18,10 +18,6 @@
 
 #include <config.h>
 
-#if !defined(QT_CLEAN_NAMESPACE)
-#define QT_CLEAN_NAMESPACE
-#endif
-
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/ksmserver/client.h b/ksmserver/client.h
index e478cfc31..4eb86114c 100644
--- a/ksmserver/client.h
+++ b/ksmserver/client.h
@@ -7,8 +7,6 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #ifndef CLIENT_H
 #define CLIENT_H
 
-// needed to avoid clash with INT8 defined in X11/Xmd.h on solaris
-#define QT_CLEAN_NAMESPACE 1
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/ksmserver/server.h b/ksmserver/server.h
index a90ef43ac..7273f057e 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -7,8 +7,6 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #ifndef SERVER_H
 #define SERVER_H
 
-// needed to avoid clash with INT8 defined in X11/Xmd.h on solaris
-#define QT_CLEAN_NAMESPACE 1
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
diff --git a/kstart/Makefile.am b/kstart/Makefile.am
index ab983d6dd..10af2d98f 100644
--- a/kstart/Makefile.am
+++ b/kstart/Makefile.am
@@ -1,6 +1,6 @@
 ####### Fiddle here
 
-AM_CPPFLAGS = -DQT_NO_CAST_ASCII -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT
+AM_CPPFLAGS = -DQT_NO_CAST_ASCII -DQT_NO_COMPAT
 
 INCLUDES = $(all_includes)
 
diff --git a/twin/group.cpp b/twin/group.cpp
index 62d235d92..8e85c3c00 100644
--- a/twin/group.cpp
+++ b/twin/group.cpp
@@ -15,8 +15,6 @@ License. See the file "COPYING" for the exact licensing terms.
 
 */
 
-//#define QT_CLEAN_NAMESPACE
-
 #include "group.h"
 
 #include "workspace.h"
diff --git a/twin/killwindow.cpp b/twin/killwindow.cpp
index 7562f2886..c67ab50a0 100644
--- a/twin/killwindow.cpp
+++ b/twin/killwindow.cpp
@@ -9,9 +9,6 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-//#ifndef QT_CLEAN_NAMESPACE
-//#define QT_CLEAN_NAMESPACE
-//#endif
 #include "killwindow.h"
 #include <tqcursor.h>
 #include <X11/Xlib.h>
diff --git a/twin/main.cpp b/twin/main.cpp
index 1919fd8e0..4fd81d245 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -9,7 +9,6 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-//#define QT_CLEAN_NAMESPACE
 #include <tdeconfig.h>
 
 #include "main.h"
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index 638bd9354..740de7cb6 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -10,7 +10,6 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-//#define QT_CLEAN_NAMESPACE
 #include "popupinfo.h"
 #include "workspace.h"
 #include "client.h"
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index 505af7abc..d88146f22 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -9,7 +9,6 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-//#define QT_CLEAN_NAMESPACE
 #include "tabbox.h"
 #include "workspace.h"
 #include "client.h"
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 0e78f0740..8cddbb72e 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -9,8 +9,6 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-//#define QT_CLEAN_NAMESPACE
-
 #include "workspace.h"
 
 #include <tdeapplication.h>
-- 
cgit v1.2.3