From d3da8b90b841d03839f29507916e435a4fa7b85b Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 15 Nov 2022 02:07:21 +0200
Subject: [PATCH] generic: remove redundant QT_CLEAN_NAMESPACE definitions

Katie's namespace is always clean, if there is a namespace issue perhaps
it is not cause of it

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 ksmserver/client.h     |  3 ---
 ksmserver/server.h     | 10 ++++------
 kwin/group.cpp         |  6 ++----
 kwin/tabbox/tabbox.cpp |  1 -
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ksmserver/client.h b/ksmserver/client.h
index 7f27ad43..04409c3f 100644
--- a/ksmserver/client.h
+++ b/ksmserver/client.h
@@ -25,9 +25,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #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 <kapplication.h>
 #include <kworkspace/kworkspace.h>
 
diff --git a/ksmserver/server.h b/ksmserver/server.h
index 9869eb59..7b340f88 100644
--- a/ksmserver/server.h
+++ b/ksmserver/server.h
@@ -25,18 +25,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #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 <QStringList>
 #include <QObject>
 #include <QProcess>
+#include <QTimer>
+#include <QDateTime>
+#include <QDBusInterface>
+#include <QMap>
 
 #include <kapplication.h>
 #include <kworkspace/kworkspace.h>
 #include <kmessagebox.h>
-#include <QTimer>
-#include <QtCore/qdatetime.h>
-#include <QMap>
 
 #define INT32 QINT32
 #include <X11/Xlib.h>
@@ -60,7 +59,6 @@ class KSMConnection;
 class KSMClient;
 
 class OrgKdeKLauncherInterface;
-#include <QDBusInterface>
 
 enum SMType { SM_ERROR, SM_WMCOMMAND, SM_WMSAVEYOURSELF };
 struct SMData
diff --git a/kwin/group.cpp b/kwin/group.cpp
index eadd7e57..6c025ec0 100644
--- a/kwin/group.cpp
+++ b/kwin/group.cpp
@@ -25,18 +25,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-//#define QT_CLEAN_NAMESPACE
-
 #include "group.h"
-#include <QTextStream>
 #include "workspace.h"
 #include "client.h"
 #include "effects.h"
 
-#include <assert.h>
 #include <kstartupinfo.h>
 #include <QtGui/qx11info_x11.h>
+#include <QTextStream>
 
+#include <assert.h>
 
 /*
  TODO
diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp
index 3a293559..c21139b6 100644
--- a/kwin/tabbox/tabbox.cpp
+++ b/kwin/tabbox/tabbox.cpp
@@ -20,7 +20,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
-//#define QT_CLEAN_NAMESPACE
 // own
 #include "tabbox.h"
 // tabbox