From f67512dd4ba4b666de3205035cbdf4394a0327cc Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 25 Sep 2018 01:20:41 +0900 Subject: [PATCH] Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define. Signed-off-by: Michele Calgaro --- dcop/dcopclient.cpp | 3 --- dcop/dcopserver.cpp | 1 - dcop/dcopserver_shutdown_win.cpp | 1 - tdecore/tdestartupinfo.cpp | 5 ----- 4 files changed, 10 deletions(-) diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index cfa912362..7c884fe46 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -50,9 +50,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#ifndef QT_CLEAN_NAMESPACE -#define QT_CLEAN_NAMESPACE -#endif #include #include #include diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index 15066047a..bacebfc49 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -47,7 +47,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #endif -#define QT_CLEAN_NAMESPACE 1 #include #include #include diff --git a/dcop/dcopserver_shutdown_win.cpp b/dcop/dcopserver_shutdown_win.cpp index ebc7897da..384bd6f36 100644 --- a/dcop/dcopserver_shutdown_win.cpp +++ b/dcop/dcopserver_shutdown_win.cpp @@ -47,7 +47,6 @@ #include #endif -#define QT_CLEAN_NAMESPACE 1 #include #include diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp index dc0b13b4d..77b979edb 100644 --- a/tdecore/tdestartupinfo.cpp +++ b/tdecore/tdestartupinfo.cpp @@ -40,11 +40,6 @@ DEALINGS IN THE SOFTWARE. #include #endif -// need to resolve INT32(tqglobal.h)<>INT32(Xlibint.h) conflict -#ifndef QT_CLEAN_NAMESPACE -#define QT_CLEAN_NAMESPACE -#endif - #include "tdestartupinfo.h" #include