10 files changed, 0 insertions, 85 deletions
diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h
index 70c91e95..a285637c 100644
--- a/src/kernel/ntqcursor.h
+++ b/src/kernel/ntqcursor.h
@@ -122,19 +122,6 @@ private:
 };
 
 
-#if !defined(QT_CLEAN_NAMESPACE)
-// CursorShape is defined in X11/X.h
-#ifdef CursorShape
-#define X_CursorShape CursorShape
-#undef CursorShape
-#endif
-typedef TQt::CursorShape TQCursorShape;
-#ifdef X_CursorShape
-#define CursorShape X_CursorShape
-#endif
-#endif
-
-
 /*****************************************************************************
   TQCursor stream functions
  *****************************************************************************/
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index a3c2ac4d..a8dce070 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -142,12 +142,6 @@ private:								\
 #define SIGNAL(a)	"2"#a
 #endif
 
-#ifndef QT_CLEAN_NAMESPACE
-#define METHOD_CODE	0			// member type codes
-#define SLOT_CODE	1
-#define SIGNAL_CODE	2
-#endif
-
 #define TQMETHOD_CODE	0			// member type codes
 #define TQSLOT_CODE	1
 #define TQSIGNAL_CODE	2
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 54b18b65..6d57f214 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -188,10 +188,4 @@ typedef void (*TQtCleanUpFunction)();
 Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction );
 Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction );
 
-#if !defined(QT_CLEAN_NAMESPACE)
-// source compatibility with TQt 2.x
-typedef TQtCleanUpFunction Q_CleanUpFunction;
-#endif
-
-
 #endif // TQWINDOWDEFS_H
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 8e859349..08402bb1 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -44,9 +44,6 @@
 // provide a proper alternative for others. See also the exports in
 // qapplication_win.cpp which suggest a unification.
 
-// ### needed for solaris-g++ in beta5
-#define QT_CLEAN_NAMESPACE
-
 #include "qplatformdefs.h"
 
 // POSIX Large File Support redefines open -> open64
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index a6503fcb..037acad5 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -38,10 +38,6 @@
 **
 **********************************************************************/
 
-#ifndef QT_CLEAN_NAMESPACE
-#define QT_CLEAN_NAMESPACE
-#endif
-
 #include "ntqimage.h"
 
 #ifndef QT_NO_IMAGEIO_JPEG
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index a7ab00e0..fa3f9bd5 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -38,10 +38,6 @@
 **
 **********************************************************************/
 
-#ifndef QT_CLEAN_NAMESPACE
-#define QT_CLEAN_NAMESPACE
-#endif
-
 #include "ntqdatetime.h"
 
 #ifndef QT_NO_IMAGEIO_MNG
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 9c2a0dae..01a2b86b 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -38,8 +38,6 @@
 **
 **********************************************************************/
 
-#define QT_CLEAN_NAMESPACE
-
 #include "ntqsound.h"
 
 #ifndef QT_NO_SOUND
diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp
index b61920fc..f49181f7 100644
--- a/src/kernel/qtkdeintegration_x11.cpp
+++ b/src/kernel/qtkdeintegration_x11.cpp
@@ -1,7 +1,6 @@
 /* This file is licensed under the terms of the GPL v2 or v3, as it has been publicly released by
    OpenSUSE as part of their GPLed TQt library disribution */
 
-#define QT_CLEAN_NAMESPACE
 #include "qtkdeintegration_x11_p.h"
 
 #include <ntqcolordialog.h>
diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h
index 0bcdffa5..e60e0969 100644
--- a/src/tools/ntqcstring.h
+++ b/src/tools/ntqcstring.h
@@ -81,20 +81,6 @@ Q_EXPORT int tqstricmp( const char *, const char * );
 
 Q_EXPORT int tqstrnicmp( const char *, const char *, uint len );
 
-#ifndef QT_CLEAN_NAMESPACE
-Q_EXPORT inline uint cstrlen( const char *str )
-{ return (uint)strlen(str); }
-
-Q_EXPORT inline char *cstrcpy( char *dst, const char *src )
-{ return strcpy(dst,src); }
-
-Q_EXPORT inline int cstrcmp( const char *str1, const char *str2 )
-{ return strcmp(str1,str2); }
-
-Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
-{ return strncmp(str1,str2,len); }
-#endif
-
 
 // tqChecksum: Internet checksum
 
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index db41468f..f7613a2a 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -702,16 +702,6 @@ inline int tqRound( double d )
 // Size-dependent types (architechture-dependent byte order)
 //
 
-#if !defined(QT_CLEAN_NAMESPACE)
-// source compatibility with TQt 1.x
-typedef signed char		INT8;		// 8 bit signed
-typedef unsigned char		UINT8;		// 8 bit unsigned
-typedef short			INT16;		// 16 bit signed
-typedef unsigned short		UINT16;		// 16 bit unsigned
-typedef int			INT32;		// 32 bit signed
-typedef unsigned int		UINT32;		// 32 bit unsigned
-#endif
-
 typedef signed char		TQ_INT8;		// 8 bit signed
 typedef unsigned char		TQ_UINT8;	// 8 bit unsigned
 typedef short			TQ_INT16;	// 16 bit signed
@@ -989,28 +979,6 @@ Q_EXPORT void tqFatal( const char *, ... )	// print fatal message and exit
 
 Q_EXPORT void tqSystemWarning( const char *, int code = -1 );
 
-#if !defined(QT_CLEAN_NAMESPACE) 		// compatibility with TQt 1
-
-Q_EXPORT void debug( const char *, ... )	// print debug message
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-    __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-Q_EXPORT void warning( const char *, ... )	// print warning message
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-    __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-Q_EXPORT void fatal( const char *, ... )	// print fatal message and exit
-#if defined(Q_CC_GNU) && !defined(__INSURE__)
-    __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-#endif // QT_CLEAN_NAMESPACE
-
 
 #if !defined(Q_ASSERT)
 #  if defined(QT_CHECK_STATE)