diff options
| -rw-r--r-- | dcop/dcopclient.cpp | 3 | ||||
| -rw-r--r-- | dcop/dcopserver.cpp | 1 | ||||
| -rw-r--r-- | dcop/dcopserver_shutdown_win.cpp | 1 | ||||
| -rw-r--r-- | tdecore/tdestartupinfo.cpp | 5 |
4 files changed, 0 insertions, 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 <assert.h> #include <string.h> -#ifndef QT_CLEAN_NAMESPACE -#define QT_CLEAN_NAMESPACE -#endif #include <tqguardedptr.h> #include <tqtextstream.h> #include <tqfile.h> 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 <limits.h> #endif -#define QT_CLEAN_NAMESPACE 1 #include <tqfile.h> #include <tqtextstream.h> #include <tqdatastream.h> 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 <signal.h> #endif -#define QT_CLEAN_NAMESPACE 1 #include <tqfile.h> #include <dcopclient.h> 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 <config.h> #endif -// need to resolve INT32(tqglobal.h)<>INT32(Xlibint.h) conflict -#ifndef QT_CLEAN_NAMESPACE -#define QT_CLEAN_NAMESPACE -#endif - #include "tdestartupinfo.h" #include <unistd.h> |