From 13aebff09703ac11a089be0e7274cac2b3aed57a Mon Sep 17 00:00:00 2001 From: Werner Trobin Date: Sat, 29 Jul 2000 07:59:24 +0000 Subject: [PATCH] Commented out some more #define QT_CLEAN_NAMESPACE statements svn path=/trunk/kdebase/kscreensaver/; revision=59186 --- client.cpp | 2 +- killwindow.cpp | 6 +++--- main.cpp | 2 +- tabbox.cpp | 2 +- workspace.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client.cpp b/client.cpp index 94c79db3b5..e4970b31c5 100644 --- a/client.cpp +++ b/client.cpp @@ -3,7 +3,7 @@ kwin - the KDE window manager Copyright (C) 1999, 2000 Matthias Ettrich ******************************************************************/ -#define QT_CLEAN_NAMESPACE +//#define QT_CLEAN_NAMESPACE #include #include #include diff --git a/killwindow.cpp b/killwindow.cpp index 216501589c..4b0d350e64 100644 --- a/killwindow.cpp +++ b/killwindow.cpp @@ -4,9 +4,9 @@ kwin - the KDE window manager Copyright (C) 1999, 2000 Matthias Ettrich ******************************************************************/ -#ifndef QT_CLEAN_NAMESPACE -#define QT_CLEAN_NAMESPACE -#endif +//#ifndef QT_CLEAN_NAMESPACE +//#define QT_CLEAN_NAMESPACE +//#endif #include "killwindow.h" #include #include diff --git a/main.cpp b/main.cpp index 8772da1a60..26d5e869ff 100644 --- a/main.cpp +++ b/main.cpp @@ -7,7 +7,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich // X11/Qt conflict #undef Bool -#define QT_CLEAN_NAMESPACE +//#define QT_CLEAN_NAMESPACE #include #include "main.h" #include "options.h" diff --git a/tabbox.cpp b/tabbox.cpp index a19dfbcb5d..b3a720782e 100644 --- a/tabbox.cpp +++ b/tabbox.cpp @@ -3,7 +3,7 @@ kwin - the KDE window manager Copyright (C) 1999, 2000 Matthias Ettrich ******************************************************************/ -#define QT_CLEAN_NAMESPACE +//#define QT_CLEAN_NAMESPACE #include "tabbox.h" #include "workspace.h" #include "client.h" diff --git a/workspace.cpp b/workspace.cpp index 9f534cf747..65461d4721 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -3,7 +3,7 @@ kwin - the KDE window manager Copyright (C) 1999, 2000 Matthias Ettrich ******************************************************************/ -#define QT_CLEAN_NAMESPACE +//#define QT_CLEAN_NAMESPACE #include #include #include