Automated update from Qt3

90 files changed, 402 insertions, 399 deletions

diff --git a/src/kernel/ntqaccel.h b/src/kernel/ntqaccel.h
index 717d2acef..ae79380c9 100644
--- a/src/kernel/ntqaccel.h
+++ b/src/kernel/ntqaccel.h
@@ -52,7 +52,7 @@ class TQAccelPrivate;
 
 class Q_EXPORT TQAccel : public TQObject			// accelerator class
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQAccel( TQWidget *parent, const char *name=0 );
     TQAccel( TQWidget* watch, TQObject *parent, const char *name=0 );
@@ -98,7 +98,7 @@ private:
     TQAccelPrivate * d;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQAccel( const TQAccel & );
     TQAccel &operator=( const TQAccel & );
 #endif
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index 2ab779760..fbeed98eb 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -72,7 +72,7 @@ extern Q_EXPORT TQApplication *qApp;		// global application object
 
 class Q_EXPORT TQApplication : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQApplication( int &argc, char **argv );
     TQApplication( int &argc, char **argv, bool GUIenabled );
@@ -439,7 +439,7 @@ private:
     friend class TQInputContext;
 #endif
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQApplication( const TQApplication & );
     TQApplication &operator=( const TQApplication & );
 #endif
diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h
index 878b2f75a..aa2968bc7 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -101,7 +101,7 @@ public:
 };
 
 class Q_EXPORT TQDataPump : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
     int interval;
     TQTimer timer;
     TQDataSource* source;
diff --git a/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h
index f61005d9c..9675b8855 100644
--- a/src/kernel/ntqclipboard.h
+++ b/src/kernel/ntqclipboard.h
@@ -52,7 +52,7 @@ class TQMimeSource;
 
 class Q_EXPORT TQClipboard : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 private:
     TQClipboard( TQObject *parent=0, const char *name=0 );
     ~TQClipboard();
@@ -123,7 +123,7 @@ private:
 #endif
 
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQClipboard( const TQClipboard & );
     TQClipboard &operator=( const TQClipboard & );
 #endif
diff --git a/src/kernel/ntqconnection.h b/src/kernel/ntqconnection.h
index db562210e..e505fcd7b 100644
--- a/src/kernel/ntqconnection.h
+++ b/src/kernel/ntqconnection.h
@@ -67,7 +67,7 @@ private:
     int	     nargs;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQConnection( const TQConnection & );
     TQConnection &operator=( const TQConnection & );
 #endif
diff --git a/src/kernel/ntqdesktopwidget.h b/src/kernel/ntqdesktopwidget.h
index cf24fe6ca..9fd400458 100644
--- a/src/kernel/ntqdesktopwidget.h
+++ b/src/kernel/ntqdesktopwidget.h
@@ -48,7 +48,7 @@ class TQDesktopWidgetPrivate; /* Don't touch! */
 
 class Q_EXPORT TQDesktopWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDesktopWidget();
     ~TQDesktopWidget();
@@ -89,7 +89,7 @@ protected:
 private:
     TQDesktopWidgetPrivate *d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDesktopWidget( const TQDesktopWidget & );
     TQDesktopWidget &operator=( const TQDesktopWidget & );
 #endif
diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h
index 303ceb99f..a960d9788 100644
--- a/src/kernel/ntqdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -55,7 +55,7 @@ class TQImageDragData;
 #ifndef QT_NO_MIME
 
 class Q_EXPORT TQDragObject: public TQObject, public TQMimeSource {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDragObject( TQWidget * dragSource = 0, const char * name = 0 );
     virtual ~TQDragObject();
@@ -86,14 +86,14 @@ protected:
 
 private:
     TQDragObjectData * d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDragObject( const TQDragObject & );
     TQDragObject &operator=( const TQDragObject & );
 #endif
 };
 
 class Q_EXPORT TQStoredDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQStoredDragData * d;
 
 public:
@@ -107,14 +107,14 @@ public:
     virtual TQByteArray encodedData(const char*) const;
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQStoredDrag( const TQStoredDrag & );
     TQStoredDrag &operator=( const TQStoredDrag & );
 #endif
 };
 
 class Q_EXPORT TQTextDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQTextDragPrivate* d;
 public:
     TQTextDrag( const TQString &,
@@ -133,14 +133,14 @@ public:
     static bool decode( const TQMimeSource* e, TQString& s, TQCString& subtype );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextDrag( const TQTextDrag & );
     TQTextDrag &operator=( const TQTextDrag & );
 #endif
 };
 
 class Q_EXPORT TQImageDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQImage img;
     TQStrList ofmts;
     TQImageDragData* d;
@@ -160,7 +160,7 @@ public:
     static bool decode( const TQMimeSource* e, TQPixmap& i );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQImageDrag( const TQImageDrag & );
     TQImageDrag &operator=( const TQImageDrag & );
 #endif
@@ -168,7 +168,7 @@ private:
 
 
 class Q_EXPORT TQUriDrag: public TQStoredDrag {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQUriDrag( TQStrList uris, TQWidget * dragSource = 0, const char * name = 0 );
@@ -190,7 +190,7 @@ public:
     static bool decodeLocalFiles( const TQMimeSource* e, TQStringList& i );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQUriDrag( const TQUriDrag & );
     TQUriDrag &operator=( const TQUriDrag & );
 #endif
@@ -198,7 +198,7 @@ private:
 
 class Q_EXPORT TQColorDrag : public TQStoredDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQColor color;
 
 public:
@@ -210,7 +210,7 @@ public:
     static bool decode( TQMimeSource *, TQColor &col );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQColorDrag( const TQColorDrag & );
     TQColorDrag &operator=( const TQColorDrag & );
 #endif
@@ -228,7 +228,7 @@ typedef TQUriDrag TQUrlDrag;
 //
 
 class Q_EXPORT TQDragManager: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     TQDragManager();
@@ -266,7 +266,7 @@ private:
 
     TQPixmap *pm_cursor;
     int n_cursor;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDragManager( const TQDragManager & );
     TQDragManager &operator=( const TQDragManager & );
 #endif
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h
index 2a98a33e2..9685159ca 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -59,7 +59,7 @@ class TQMutex;
 
 class Q_EXPORT TQEventLoop : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQEventLoop( TQObject *parent = 0, const char *name = 0 );
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index d7bbcbee0..f4fb7d783 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -82,9 +82,9 @@
 #  define Q_PLUGIN_VERIFICATION_DATA \
 	static const char *qt_ucm_verification_data =			\
             "pattern=""QT_UCM_VERIFICATION_DATA""\n"			\
-            "version="QT_VERSION_STR"\n"				\
+            "version="TQT_VERSION_STR"\n"				\
             "flags="Q_PLUGIN_FLAGS_STRING"\n"				\
-	    "buildkey="QT_BUILD_KEY"\0";
+	    "buildkey="TQT_BUILD_KEY"\0";
 #endif // Q_PLUGIN_VERIFICATION_DATA
 
 #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION )	\
@@ -112,7 +112,7 @@ struct TQUnknownInterface;
 
 class Q_EXPORT TQGPlugin : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGPlugin( TQUnknownInterface *i );
     ~TQGPlugin();
diff --git a/src/kernel/ntqguardedptr.h b/src/kernel/ntqguardedptr.h
index 21a4d154f..3d1fe4813 100644
--- a/src/kernel/ntqguardedptr.h
+++ b/src/kernel/ntqguardedptr.h
@@ -48,7 +48,7 @@
 // ### 4.0: rename to something without Private in it. Not really internal.
 class Q_EXPORT TQGuardedPtrPrivate : public TQObject, public TQShared
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGuardedPtrPrivate( TQObject* );
     ~TQGuardedPtrPrivate();
@@ -61,7 +61,7 @@ private slots:
 
 private:
     TQObject* obj;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQGuardedPtrPrivate( const TQGuardedPtrPrivate & );
     TQGuardedPtrPrivate &operator=( const TQGuardedPtrPrivate & );
 #endif
diff --git a/src/kernel/ntqiconset.h b/src/kernel/ntqiconset.h
index 7ecbfa52a..a16d96553 100644
--- a/src/kernel/ntqiconset.h
+++ b/src/kernel/ntqiconset.h
@@ -116,7 +116,7 @@ public:
     static void installDefaultFactory( TQIconFactory *factory );
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIconFactory( const TQIconFactory & );
     TQIconFactory &operator=( const TQIconFactory & );
 #endif
diff --git a/src/kernel/ntqimage.h b/src/kernel/ntqimage.h
index 34b585b7e..e4f23596f 100644
--- a/src/kernel/ntqimage.h
+++ b/src/kernel/ntqimage.h
@@ -326,7 +326,7 @@ private:
     TQImageIOData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQImageIO( const TQImageIO & );
     TQImageIO &operator=( const TQImageIO & );
 #endif
diff --git a/src/kernel/ntqimageformatplugin.h b/src/kernel/ntqimageformatplugin.h
index db9fb3806..74ec7c2eb 100644
--- a/src/kernel/ntqimageformatplugin.h
+++ b/src/kernel/ntqimageformatplugin.h
@@ -50,7 +50,7 @@ class TQImageFormatPluginPrivate;
 
 class Q_EXPORT TQImageFormatPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQImageFormatPlugin();
     ~TQImageFormatPlugin();
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index cc3eafae9..4eaddb8ed 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -43,7 +43,7 @@
 #include "ntqglobal.h"
 #include "ntqevent.h"
 #include "ntqstring.h"
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #include "ntqlist.h"
 #include "ntqaction.h"
 #else
@@ -62,7 +62,7 @@ struct TQInputContextMenu {
 	NoSeparator,
 	InsertSeparator
     };
-#if !(QT_VERSION-0 >= 0x040000)
+#if !(TQT_VERSION-0 >= 0x040000)
     TQString title;
     TQPopupMenu *popup;
 #endif
@@ -71,7 +71,7 @@ struct TQInputContextMenu {
 
 class TQInputContext : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQInputContext( TQObject *parent = 0 );
     virtual ~TQInputContext();
@@ -94,7 +94,7 @@ public:
     virtual bool isComposing() const;
     virtual bool isPreeditRelocationEnabled();
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
     virtual TQList<TQAction *> actions();
     void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator );
 #else
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index c461724a1..2405a7f15 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -52,7 +52,7 @@
 #ifndef QT_NO_LAYOUT
 
 #if 0
-Q_OBJECT
+TQ_OBJECT
 #endif
 
 static const int TQLAYOUTSIZE_MAX = INT_MAX/256/16;
@@ -178,7 +178,7 @@ private:
 
 class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ResizeMode )
     Q_PROPERTY( int margin READ margin WRITE setMargin )
     Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
@@ -275,7 +275,7 @@ private:
 #endif
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLayout( const TQLayout & );
     TQLayout &operator=( const TQLayout & );
 #endif
@@ -290,7 +290,7 @@ inline void TQLayoutIterator::deleteCurrent()
 
 class Q_EXPORT TQGridLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -353,7 +353,7 @@ protected:
     void add( TQLayoutItem*, int row, int col );
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGridLayout( const TQGridLayout & );
     TQGridLayout &operator=( const TQGridLayout & );
 #endif
@@ -367,7 +367,7 @@ class TQDockWindow;
 
 class Q_EXPORT TQBoxLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop,
 		     Down = TopToBottom, Up = BottomToTop };
@@ -419,7 +419,7 @@ protected:
 
 private:
     friend class TQDockWindow;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQBoxLayout( const TQBoxLayout & );
     TQBoxLayout &operator=( const TQBoxLayout & );
 #endif
@@ -433,7 +433,7 @@ private:
 
 class Q_EXPORT TQHBoxLayout : public TQBoxLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -444,7 +444,7 @@ public:
     ~TQHBoxLayout();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHBoxLayout( const TQHBoxLayout & );
     TQHBoxLayout &operator=( const TQHBoxLayout & );
 #endif
@@ -452,7 +452,7 @@ private:	// Disabled copy constructor and operator=
 
 class Q_EXPORT TQVBoxLayout : public TQBoxLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -463,7 +463,7 @@ public:
     ~TQVBoxLayout();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVBoxLayout( const TQVBoxLayout & );
     TQVBoxLayout &operator=( const TQVBoxLayout & );
 #endif
diff --git a/src/kernel/ntqlocalfs.h b/src/kernel/ntqlocalfs.h
index ac1d6c189..72c635907 100644
--- a/src/kernel/ntqlocalfs.h
+++ b/src/kernel/ntqlocalfs.h
@@ -50,7 +50,7 @@
 
 class Q_EXPORT TQLocalFs : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQLocalFs();
diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h
index e269024b6..c8289a1da 100644
--- a/src/kernel/ntqmetaobject.h
+++ b/src/kernel/ntqmetaobject.h
@@ -251,7 +251,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMetaObject( const TQMetaObject & );
     TQMetaObject &operator=( const TQMetaObject & );
 #endif
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index 28e431eb5..7ab9327a3 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -82,7 +82,7 @@ typedef TQDict< TQNetworkProtocolFactoryBase > TQNetworkProtocolDict;
 
 class Q_EXPORT TQNetworkProtocol : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum State {
@@ -188,7 +188,7 @@ private slots:
     void removeMe();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQNetworkProtocol( const TQNetworkProtocol & );
     TQNetworkProtocol &operator=( const TQNetworkProtocol & );
 #endif
@@ -198,7 +198,7 @@ class TQNetworkOperationPrivate;
 
 class Q_EXPORT TQNetworkOperation : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQUrlOperator;
 
 public:
@@ -233,7 +233,7 @@ private:
     TQNetworkOperationPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQNetworkOperation( const TQNetworkOperation & );
     TQNetworkOperation &operator=( const TQNetworkOperation & );
 #endif
diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h
index 804e6f1af..dc4ef21a0 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/ntqobject.h
@@ -65,7 +65,7 @@ struct TQUObject;
 
 class Q_EXPORT TQObject: public TQt
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQCString name READ name WRITE setName )
 
 public:
@@ -213,7 +213,7 @@ private:
     friend class TQSignal;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQObject( const TQObject & );
     TQObject &operator=( const TQObject & );
 #endif
diff --git a/src/kernel/ntqobjectcleanuphandler.h b/src/kernel/ntqobjectcleanuphandler.h
index 464fd7bf7..74f4dae8d 100644
--- a/src/kernel/ntqobjectcleanuphandler.h
+++ b/src/kernel/ntqobjectcleanuphandler.h
@@ -47,7 +47,7 @@ class TQObjectList;
 
 class Q_EXPORT TQObjectCleanupHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQObjectCleanupHandler();
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index 3b4b71e1d..d9b18722e 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -49,17 +49,17 @@
 #ifndef QT_NO_TRANSLATION
 # ifndef QT_NO_TEXTCODEC
 // full set of tr functions
-#  define QT_TR_FUNCTIONS \
+#  define TQT_TR_FUNCTIONS \
     static TQString tr( const char *, const char * = 0 ); \
     static TQString trUtf8( const char *, const char * = 0 );
 # else
 // no TQTextCodec, no utf8
-#  define QT_TR_FUNCTIONS \
+#  define TQT_TR_FUNCTIONS \
     static TQString tr( const char *, const char * = 0 );
 # endif
 #else
 // inherit the ones from TQObject
-# define QT_TR_FUNCTIONS
+# define TQT_TR_FUNCTIONS
 #endif
 
 #ifndef QT_NO_PROPERTIES
@@ -82,10 +82,10 @@ struct TQUObject;
 #define Q_OVERRIDE( text )	    Q_OVERRIDE( text )
 #define Q_ENUMS( x )		    Q_ENUMS( x )
 #define Q_SETS( x )		    Q_SETS( x )
- /* tmake ignore Q_OBJECT */
-#define Q_OBJECT		    Q_OBJECT
- /* tmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE		    Q_OBJECT_FAKE
+ /* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT		    TQ_OBJECT
+ /* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT_FAKE		    TQ_OBJECT_FAKE
 
 #else
 #define slots					// slots: in class
@@ -99,8 +99,8 @@ struct TQUObject;
 #define Q_ENUMS( x )
 #define Q_SETS( x )
 
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT							\
+/* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT							\
 public:									\
     virtual TQMetaObject *metaObject() const { 				\
          return staticMetaObject();					\
@@ -112,12 +112,12 @@ public:									\
     QT_PROP_FUNCTIONS							\
     static TQMetaObject* staticMetaObject();				\
     TQObject* qObject() { return (TQObject*)this; } 			\
-    QT_TR_FUNCTIONS							\
+    TQT_TR_FUNCTIONS							\
 private:								\
     static TQMetaObject *metaObj;
 
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE Q_OBJECT
+/* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT_FAKE TQ_OBJECT
 
 #endif
 
diff --git a/src/kernel/ntqobjectlist.h b/src/kernel/ntqobjectlist.h
index c1d8f7982..429be7bd4 100644
--- a/src/kernel/ntqobjectlist.h
+++ b/src/kernel/ntqobjectlist.h
@@ -73,7 +73,7 @@ public:
 		 TQPtrListIterator<TQObject>::operator=( i ); }
 };
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
 #warning "remove the TQObjectListIt class"
 #warning "remove the typedef too, maybe"
diff --git a/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h
index 771aff492..8b54afb4b 100644
--- a/src/kernel/ntqpaintdevice.h
+++ b/src/kernel/ntqpaintdevice.h
@@ -284,7 +284,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPaintDevice( const TQPaintDevice & );
     TQPaintDevice &operator=( const TQPaintDevice & );
 #endif
diff --git a/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h
index bcccdb59e..a86dea4fb 100644
--- a/src/kernel/ntqpainter.h
+++ b/src/kernel/ntqpainter.h
@@ -427,7 +427,7 @@ protected:
     friend class TQPrinter;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPainter( const TQPainter & );
     TQPainter &operator=( const TQPainter & );
 #endif
diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h
index fa7b9caa8..a72d3d9cf 100644
--- a/src/kernel/ntqprinter.h
+++ b/src/kernel/ntqprinter.h
@@ -223,7 +223,7 @@ private:
     TQPrinterPrivate *d;
 
 private:        // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPrinter( const TQPrinter & );
     TQPrinter &operator=( const TQPrinter & );
 #endif
diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h
index e9a77e3ed..2e76223de 100644
--- a/src/kernel/ntqprocess.h
+++ b/src/kernel/ntqprocess.h
@@ -55,7 +55,7 @@ class TQMembuf;
 
 class Q_EXPORT TQProcess : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQProcess( TQObject *parent=0, const char *name=0 );
     TQProcess( const TQString& arg0, TQObject *parent=0, const char *name=0 );
@@ -167,7 +167,7 @@ private:
     friend class TQProc;
 #endif
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQProcess( const TQProcess & );
     TQProcess &operator=( const TQProcess & );
 #endif
diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h
index 6a435c3a1..d203f951c 100644
--- a/src/kernel/ntqsessionmanager.h
+++ b/src/kernel/ntqsessionmanager.h
@@ -53,7 +53,7 @@ class TQSessionManagerData;
 
 class Q_EXPORT  TQSessionManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQSessionManager( TQApplication *app, TQString &id, TQString &key );
     ~TQSessionManager();
 public:
diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h
index 0664fe5d2..281b2278a 100644
--- a/src/kernel/ntqsignal.h
+++ b/src/kernel/ntqsignal.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQSignal : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQSignal( TQObject *parent=0, const char *name=0 );
@@ -84,7 +84,7 @@ private:
     TQVariant val;
 #endif
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSignal( const TQSignal & );
     TQSignal &operator=( const TQSignal & );
 #endif
diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/ntqsignalmapper.h
index 2b560a7cd..a7dc9aad0 100644
--- a/src/kernel/ntqsignalmapper.h
+++ b/src/kernel/ntqsignalmapper.h
@@ -50,7 +50,7 @@ struct TQSignalMapperRec;
 
 
 class Q_EXPORT TQSignalMapper : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSignalMapper( TQObject* parent, const char* name=0 );
     ~TQSignalMapper();
diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h
index e8b479a8d..928dbb855 100644
--- a/src/kernel/ntqsimplerichtext.h
+++ b/src/kernel/ntqsimplerichtext.h
@@ -93,7 +93,7 @@ private:
     TQSimpleRichTextData* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSimpleRichText( const TQSimpleRichText & );
     TQSimpleRichText &operator=( const TQSimpleRichText & );
 #endif
diff --git a/src/kernel/ntqsizegrip.h b/src/kernel/ntqsizegrip.h
index 20fab72e0..c55e9b76a 100644
--- a/src/kernel/ntqsizegrip.h
+++ b/src/kernel/ntqsizegrip.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQSizeGrip: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSizeGrip( TQWidget* parent, const char* name=0 );
     ~TQSizeGrip();
diff --git a/src/kernel/ntqsocketnotifier.h b/src/kernel/ntqsocketnotifier.h
index df92ce8ea..ec42bd191 100644
--- a/src/kernel/ntqsocketnotifier.h
+++ b/src/kernel/ntqsocketnotifier.h
@@ -48,7 +48,7 @@
 
 class Q_EXPORT TQSocketNotifier : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Type { Read, Write, Exception };
 
@@ -73,7 +73,7 @@ private:
     bool	 snenabled;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocketNotifier( const TQSocketNotifier & );
     TQSocketNotifier &operator=( const TQSocketNotifier & );
 #endif
diff --git a/src/kernel/ntqsound.h b/src/kernel/ntqsound.h
index 3e4efda58..36e84b5c3 100644
--- a/src/kernel/ntqsound.h
+++ b/src/kernel/ntqsound.h
@@ -49,7 +49,7 @@
 class TQSoundData;
 
 class Q_EXPORT TQSound : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static bool isAvailable();
     static void play(const TQString& filename);
@@ -102,7 +102,7 @@ public:
 };
 
 class Q_EXPORT TQAuServer : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQAuServer(TQObject* parent, const char* name);
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index f36ad8a2b..0cacb8b20 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -123,7 +123,7 @@ class TQStyleHintReturn; // not defined yet
 
 class Q_EXPORT TQStyle: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQStyle();
@@ -748,7 +748,7 @@ public:
 private:
     TQStylePrivate * d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStyle( const TQStyle & );
     TQStyle& operator=( const TQStyle & );
 #endif
diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h
index b73d6f0ae..7e13ad2f0 100644
--- a/src/kernel/ntqstylesheet.h
+++ b/src/kernel/ntqstylesheet.h
@@ -207,7 +207,7 @@ class TQTextCustomItem;
 
 class Q_EXPORT TQStyleSheet : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQStyleSheet( TQObject *parent=0, const char *name=0 );
     virtual ~TQStyleSheet();
@@ -242,7 +242,7 @@ private:
     TQDict<TQStyleSheetItem> styles;
     TQStyleSheetItem* nullstyle;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStyleSheet( const TQStyleSheet & );
     TQStyleSheet &operator=( const TQStyleSheet & );
 #endif
diff --git a/src/kernel/ntqthread.h b/src/kernel/ntqthread.h
index 56480a3fb..c3679fbc0 100644
--- a/src/kernel/ntqthread.h
+++ b/src/kernel/ntqthread.h
@@ -119,10 +119,10 @@ private:
     TQThreadInstance * d;
     friend class TQThreadInstance;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQThread( const TQThread & );
     TQThread &operator=( const TQThread & );
-#endif // Q_DISABLE_COPY
+#endif // TQ_DISABLE_COPY
 };
 
 #endif // QT_THREAD_SUPPORT
diff --git a/src/kernel/ntqtimer.h b/src/kernel/ntqtimer.h
index 103c65ab9..7496a22cb 100644
--- a/src/kernel/ntqtimer.h
+++ b/src/kernel/ntqtimer.h
@@ -48,7 +48,7 @@
 
 class Q_EXPORT TQTimer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTimer( TQObject *parent=0, const char *name=0 );
    ~TQTimer();
@@ -75,7 +75,7 @@ private:
     uint nulltimer : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTimer( const TQTimer & );
     TQTimer &operator=( const TQTimer & );
 #endif
diff --git a/src/kernel/ntqtranslator.h b/src/kernel/ntqtranslator.h
index eccc8e4c1..bbbda7eed 100644
--- a/src/kernel/ntqtranslator.h
+++ b/src/kernel/ntqtranslator.h
@@ -104,7 +104,7 @@ private:
 
 class Q_EXPORT TQTranslator: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTranslator( TQObject * parent = 0, const char * name = 0 );
     ~TQTranslator();
@@ -152,7 +152,7 @@ public:
     bool isEmpty() const;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTranslator( const TQTranslator & );
     TQTranslator &operator=( const TQTranslator & );
 #endif
diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/ntqurlinfo.h
index 18ef71c57..c1c756dca 100644
--- a/src/kernel/ntqurlinfo.h
+++ b/src/kernel/ntqurlinfo.h
@@ -64,7 +64,7 @@ public:
     TQUrlInfo();
     TQUrlInfo( const TQUrlOperator &path, const TQString &file );
     TQUrlInfo( const TQUrlInfo &ui );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::TQUrlInfo() should accept TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQUrlInfo( const TQString &name, int permissions, const TQString &owner,
@@ -94,7 +94,7 @@ public:
     virtual void setSymLink( bool b );
     virtual void setOwner( const TQString &s );
     virtual void setGroup( const TQString &s );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::setSize() should accept TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     virtual void setSize( TQIODevice::Offset size );
@@ -112,7 +112,7 @@ public:
     int permissions() const;
     TQString owner() const;
     TQString group() const;
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::size() should return TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQIODevice::Offset size() const;
diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h
index 654cc313f..1c1acf262 100644
--- a/src/kernel/ntqurloperator.h
+++ b/src/kernel/ntqurloperator.h
@@ -58,7 +58,7 @@ class Q_EXPORT TQUrlOperator : public TQObject, public TQUrl
 {
     friend class TQNetworkProtocol;
 
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQUrlOperator();
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index 8a5bcf775..4a5672ea3 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -66,7 +66,7 @@ class TQStyle;
 
 class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
     Q_PROPERTY( bool isTopLevel READ isTopLevel )
     Q_PROPERTY( bool isDialog READ isDialog )
@@ -746,7 +746,7 @@ private:
     friend class TQLayout;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidget( const TQWidget & );
     TQWidget &operator=( const TQWidget & );
 #endif
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index bbc317570..3ad58fec2 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -180,7 +180,7 @@ const TQCOORD TQCOORD_MIN = -TQCOORD_MAX - 1;
 
 typedef unsigned int TQRgb;			// RGB triplet
 
-Q_EXPORT const char *qAppName();		// get application name
+Q_EXPORT const char *tqAppName();		// get application name
 
 // Misc functions
 
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 019dd8369..5e34f6ce0 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -802,7 +802,7 @@ bool TQAccel::connectItem( int id, const TQObject *receiver, const char *member
     if ( item ) {
 	if ( !item->signal ) {
 	    item->signal = new TQSignal;
-	    Q_CHECK_PTR( item->signal );
+	    TQ_CHECK_PTR( item->signal );
 	}
 	return item->signal->connect( receiver, member );
     }
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp
index e89cf2c04..fdf7e93b7 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/qaccessible.cpp
@@ -294,7 +294,7 @@ static TQPluginManager<TQAccessibleFactoryInterface> *qAccessibleManager = 0;
 
 class AccessibleCache : public TQObject, public TQPtrDict<TQAccessibleInterface>
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AccessibleCache()
         : TQPtrDict<TQAccessibleInterface>(73)
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 6eb69ff45..c15f19ab4 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -481,7 +481,7 @@ Q_EXPORT void qAddPostRoutine( TQtCleanUpFunction p)
 {
     if ( !postRList ) {
 	postRList = new TQVFuncList;
-	Q_CHECK_PTR( postRList );
+	TQ_CHECK_PTR( postRList );
     }
     postRList->prepend( p );
 }
@@ -1878,7 +1878,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
     if ( !className ) {
 	if ( !app_pal ) {
 	    app_pal = new TQPalette( pal );
-	    Q_CHECK_PTR( app_pal );
+	    TQ_CHECK_PTR( app_pal );
 	} else {
 	    *app_pal = pal;
 	}
@@ -1889,7 +1889,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
     } else {
 	if ( !app_palettes ) {
 	    app_palettes = new TQAsciiDict<TQPalette>;
-	    Q_CHECK_PTR( app_palettes );
+	    TQ_CHECK_PTR( app_palettes );
 	    app_palettes->setAutoDelete( TRUE );
 	}
 	oldpal = app_palettes->find( className );
@@ -1934,7 +1934,7 @@ TQFont TQApplication::font( const TQWidget *w )
     }
     if ( !app_font ) {
 	app_font = new TQFont( "Helvetica" );
-	Q_CHECK_PTR( app_font );
+	TQ_CHECK_PTR( app_font );
     }
     return *app_font;
 }
@@ -1964,7 +1964,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets,
 	qt_app_has_font = TRUE;
 	if ( !app_font ) {
 	    app_font = new TQFont( font );
-	    Q_CHECK_PTR( app_font );
+	    TQ_CHECK_PTR( app_font );
 	} else {
 	    *app_font = font;
 	}
@@ -1979,11 +1979,11 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets,
     } else {
 	if (!app_fonts){
 	    app_fonts = new TQAsciiDict<TQFont>;
-	    Q_CHECK_PTR( app_fonts );
+	    TQ_CHECK_PTR( app_fonts );
 	    app_fonts->setAutoDelete( TRUE );
 	}
 	TQFont* fnt = new TQFont(font);
-	Q_CHECK_PTR( fnt );
+	TQ_CHECK_PTR( fnt );
 	app_fonts->insert(className, fnt);
     }
     if ( informWidgets && is_app_running && !is_app_closing ) {
@@ -3110,7 +3110,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event )
 
     if ( !globalPostedEvents ) {			// create list
 	globalPostedEvents = new TQPostEventList;
-	Q_CHECK_PTR( globalPostedEvents );
+	TQ_CHECK_PTR( globalPostedEvents );
 	globalPostedEvents->setAutoDelete( TRUE );
 	qapp_cleanup_events.set( &globalPostedEvents );
     }
@@ -3757,7 +3757,7 @@ TQDesktopWidget *TQApplication::desktop()
     if ( !qt_desktopWidget || // not created yet
 	 !qt_desktopWidget->isDesktop() ) { // reparented away
 	qt_desktopWidget = new TQDesktopWidget();
-	Q_CHECK_PTR( qt_desktopWidget );
+	TQ_CHECK_PTR( qt_desktopWidget );
     }
     return qt_desktopWidget;
 }
@@ -3770,7 +3770,7 @@ TQClipboard *TQApplication::clipboard()
 {
     if ( qt_clipboard == 0 ) {
 	qt_clipboard = new TQClipboard;
-	Q_CHECK_PTR( qt_clipboard );
+	TQ_CHECK_PTR( qt_clipboard );
     }
     return qt_clipboard;
 }
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 1c285c44c..4579b98fd 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -1019,7 +1019,7 @@ bool TQApplication::x11_apply_settings()
 
     // read library (ie. plugin) path list
     TQString libpathkey =
-	TQString("/qt/%1.%2/libraryPath").arg( QT_VERSION >> 16 ).arg( (QT_VERSION & 0xff00 ) >> 8 );
+	TQString("/qt/%1.%2/libraryPath").arg( TQT_VERSION >> 16 ).arg( (TQT_VERSION & 0xff00 ) >> 8 );
     TQStringList pathlist = settings.readListEntry(libpathkey, ':');
     if (! pathlist.isEmpty()) {
 	TQStringList::ConstIterator it = pathlist.begin();
@@ -1835,13 +1835,13 @@ void qt_init_internal( int *argcptr, char **argv,
 	TQPaintDevice::x_appdefcolormap_arr = new bool[ appScreenCount ];
 	TQPaintDevice::x_appvisual_arr = new void*[ appScreenCount ];
 	TQPaintDevice::x_appdefvisual_arr = new bool[ appScreenCount ];
-	Q_CHECK_PTR( TQPaintDevice::x_appdepth_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appcells_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_approotwindow_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appcolormap_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appdefcolormap_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appvisual_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appdefvisual_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdepth_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appcells_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_approotwindow_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appcolormap_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdefcolormap_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appvisual_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdefvisual_arr );
 
 	int screen;
 	TQString serverVendor( ServerVendor( appDpy) );
@@ -2384,8 +2384,8 @@ void qt_init_internal( int *argcptr, char **argv,
 
 		// read library (ie. plugin) path list
 		TQString libpathkey = TQString("/qt/%1.%2/libraryPath")
-				     .arg( QT_VERSION >> 16 )
-				     .arg( (QT_VERSION & 0xff00 ) >> 8 );
+				     .arg( TQT_VERSION >> 16 )
+				     .arg( (TQT_VERSION & 0xff00 ) >> 8 );
 		TQStringList pathlist =
 		    settings.readListEntry(libpathkey, ':');
 		if (! pathlist.isEmpty()) {
@@ -2618,7 +2618,7 @@ bool qt_wstate_iconified( WId winid )
     return iconic;
 }
 
-const char *qAppName()				// get application name
+const char *tqAppName()				// get application name
 {
     return appName;
 }
@@ -2873,11 +2873,11 @@ void TQApplication::setOverrideCursor( const TQCursor &cursor, bool replace )
 {
     if ( !cursorStack ) {
 	cursorStack = new TQCursorList;
-	Q_CHECK_PTR( cursorStack );
+	TQ_CHECK_PTR( cursorStack );
 	cursorStack->setAutoDelete( TRUE );
     }
     app_cursor = new TQCursor( cursor );
-    Q_CHECK_PTR( app_cursor );
+    TQ_CHECK_PTR( app_cursor );
     if ( replace )
 	cursorStack->removeLast();
     cursorStack->append( app_cursor );
@@ -3176,7 +3176,7 @@ void qPRCreate( const TQWidget *widget, Window oldwin )
 {						// TQWidget::reparent mechanism
     if ( !wPRmapper ) {
 	wPRmapper = new TQWidgetIntDict;
-	Q_CHECK_PTR( wPRmapper );
+	TQ_CHECK_PTR( wPRmapper );
     }
     wPRmapper->insert( (long)oldwin, widget );	// add old window to mapper
     TQETWidget *w = (TQETWidget *)widget;
@@ -3846,7 +3846,7 @@ void qt_enter_modal( TQWidget *widget )
 {
     if ( !qt_modal_stack ) {			// create modal stack
 	qt_modal_stack = new TQWidgetList;
-	Q_CHECK_PTR( qt_modal_stack );
+	TQ_CHECK_PTR( qt_modal_stack );
     }
     if (widget->parentWidget()) {
 	TQEvent e(TQEvent::WindowBlocked);
@@ -3941,7 +3941,7 @@ void TQApplication::openPopup( TQWidget *popup )
     openPopupCount++;
     if ( !popupWidgets ) {			// create list
 	popupWidgets = new TQWidgetList;
-	Q_CHECK_PTR( popupWidgets );
+	TQ_CHECK_PTR( popupWidgets );
     }
     popupWidgets->append( popup );		// add to end of list
 
@@ -6223,7 +6223,7 @@ public:
 
 class TQSmSocketReceiver : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSmSocketReceiver( int socket )
 	: TQObject(0,0)
@@ -6375,8 +6375,8 @@ static void sm_performSaveYourself( TQSessionManagerData* smd )
     // generate a restart and discard command that makes sense
     TQStringList restart;
     restart  << qApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey;
-    if (qstricmp(qAppName(), qAppClass()) != 0)
-	restart << "-name" << qAppName();
+    if (qstricmp(tqAppName(), qAppClass()) != 0)
+	restart << "-name" << tqAppName();
     sm->setRestartCommand( restart );
     TQStringList discard;
     sm->setDiscardCommand( discard );
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index 41164a4c6..21485fd1f 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -346,7 +346,7 @@ TQImageDecoder::TQImageDecoder(TQImageConsumer* c)
 {
     qt_init_image_handlers();
     d = new TQImageDecoderPrivate;
-    Q_CHECK_PTR(d);
+    TQ_CHECK_PTR(d);
     consumer = c;
     actual_decoder = 0;
 }
@@ -1138,7 +1138,7 @@ int TQGIFFormat::decode(TQImage& img, TQImageConsumer* consumer,
 	    if (count<11) hold[count]=ch;
 	    count++;
 	    if (count==hold[0]+1) {
-		if (qstrncmp((char*)(hold+1), "NETSCAPE", 8)==0) {
+		if (tqstrncmp((char*)(hold+1), "NETSCAPE", 8)==0) {
 		    // Looping extension
 		    state=NetscapeExtensionBlockSize;
 		} else {
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 379e8249a..8f602d84e 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -238,7 +238,7 @@ static TQClipboardData *clipboardData()
 {
     if ( internalCbData == 0 ) {
 	internalCbData = new TQClipboardData;
-	Q_CHECK_PTR( internalCbData );
+	TQ_CHECK_PTR( internalCbData );
 	qAddPostRoutine( cleanupClipboardData );
     }
     return internalCbData;
@@ -260,7 +260,7 @@ static TQClipboardData *selectionData()
 {
     if (internalSelData == 0) {
 	internalSelData = new TQClipboardData;
-	Q_CHECK_PTR(internalSelData);
+	TQ_CHECK_PTR(internalSelData);
 	qAddPostRoutine(cleanupSelectionData);
     }
     return internalSelData;
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 38080b42a..4328babc0 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -242,12 +242,12 @@ void TQColor::initialize()
 	    // we allocated.
 	    screendata[scr]->g_cells = TQMIN(ncols,256);
 	    screendata[scr]->g_carr  = new XColor[screendata[scr]->g_cells];
-	    Q_CHECK_PTR( screendata[scr]->g_carr );
+	    TQ_CHECK_PTR( screendata[scr]->g_carr );
 	    memset( screendata[scr]->g_carr, 0,
 		    screendata[scr]->g_cells*sizeof(XColor) );
 	    screendata[scr]->g_carr_fetch = TRUE;	// run XQueryColors on demand
 	    screendata[scr]->g_our_alloc = new bool[screendata[scr]->g_cells];
-	    Q_CHECK_PTR( screendata[scr]->g_our_alloc );
+	    TQ_CHECK_PTR( screendata[scr]->g_our_alloc );
 	    memset( screendata[scr]->g_our_alloc, FALSE,
 		    screendata[scr]->g_cells*sizeof(bool) );
 	    XColor *xc = &screendata[scr]->g_carr[0];
@@ -273,7 +273,7 @@ void TQColor::initialize()
 	    dictsize = col_std_dict;
 	}
 	screendata[scr]->colorDict = new TQColorDict(dictsize);	// create dictionary
-	Q_CHECK_PTR( screendata[scr]->colorDict );
+	TQ_CHECK_PTR( screendata[scr]->colorDict );
 
 	if ( spec == (int)TQApplication::ManyColor ) {
 	    screendata[scr]->color_reduce = TRUE;
@@ -572,7 +572,7 @@ uint TQColor::alloc( int screen )
     }
     if ( !many || current_alloc_context != 0 ) {
 	c = new TQColorData;			// insert into color dict
-	Q_CHECK_PTR( c );
+	TQ_CHECK_PTR( c );
 	c->pix	   = pix;
 	c->context = current_alloc_context;
 	sd->colorDict->insert( (long)d.argb, c );	// store color in dict
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index b880988fb..56529a077 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -220,7 +220,7 @@ TQCursor::TQCursor( HANDLE cursor )
 	initialize();
 
     data = new TQCursorData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->hcurs = cursor;
 }
 
@@ -242,7 +242,7 @@ void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &mask,
 	return;
     }
     data = new TQCursorData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->bm  = new TQBitmap( bitmap );
     data->bmm = new TQBitmap( mask );
     data->hcurs = 0;
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index 96653b1c2..e74847cd0 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -1350,7 +1350,7 @@ void TQUriDrag::setUris( TQStrList uris )
     TQByteArray a;
     int c=0;
     for ( const char* s = uris.first(); s; s = uris.next() ) {
-	int l = qstrlen(s);
+	int l = tqstrlen(s);
 	a.resize(c+l+2);
 	memcpy(a.data()+c,s,l);
 	memcpy(a.data()+c+l,"\r\n",2);
@@ -1603,7 +1603,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri)
 	    char hostname[ 257 ];
 	    if ( gethostname( hostname, 255 ) == 0 ) {
 		hostname[ 256 ] = '\0';
-		if ( qstrncmp( uri+1, hostname, hostname_end - ( uri+1 )) == 0 ) {
+		if ( tqstrncmp( uri+1, hostname, hostname_end - ( uri+1 )) == 0 ) {
 		    uri = hostname_end + 1; // point after the slash
 		    local = TRUE;
 		}
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index b131a701f..f7b829a91 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -263,12 +263,12 @@ timeval *qt_wait_timer()
 static void initTimers()			// initialize timers
 {
     timerBitVec = new TQBitArray( 128 );
-    Q_CHECK_PTR( timerBitVec );
+    TQ_CHECK_PTR( timerBitVec );
     int i = timerBitVec->size();
     while( i-- > 0 )
 	timerBitVec->clearBit( i );
     timerList = new TimerList;
-    Q_CHECK_PTR( timerList );
+    TQ_CHECK_PTR( timerList );
     timerList->setAutoDelete( TRUE );
     gettimeofday( &watchtime, 0 );
 }
@@ -293,7 +293,7 @@ int qStartTimer( int interval, TQObject *obj )
 	return 0;
     timerBitVec->setBit( id-1 );		// set timer active
     TimerInfo *t = new TimerInfo;		// create timer
-    Q_CHECK_PTR( t );
+    TQ_CHECK_PTR( t );
     t->id = id;
     t->interval.tv_sec  = interval/1000;
     t->interval.tv_usec = (interval%1000)*1000;
@@ -379,13 +379,13 @@ void TQEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
     if ( ! list ) {
 	// create new list, the TQSockNotType destructor will delete it for us
 	list = new TQPtrList<TQSockNot>;
-	Q_CHECK_PTR( list );
+	TQ_CHECK_PTR( list );
 	list->setAutoDelete( TRUE );
 	d->sn_vec[type].list = list;
     }
 
     sn = new TQSockNot;
-    Q_CHECK_PTR( sn );
+    TQ_CHECK_PTR( sn );
     sn->obj = notifier;
     sn->fd = sockfd;
     sn->queue = &d->sn_vec[type].pending_fds;
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 6e78fa43a..4521e89b4 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -97,7 +97,7 @@ bool TQFontDef::operator==( const TQFontDef &other ) const
     } else if (pointSize != -1 && other.pointSize != -1) {
 	if (pointSize != other.pointSize
 	    && (TQABS(pointSize - other.pointSize) >= 5
-		|| qRound(pointSize/10.) != qRound(other.pointSize/10.)))
+		|| tqRound(pointSize/10.) != tqRound(other.pointSize/10.)))
 	    return FALSE;
     } else {
 	return FALSE;
@@ -535,7 +535,7 @@ TQFontEngineData::~TQFontEngineData()
 TQFont::TQFont( TQFontPrivate *data, TQPaintDevice *pd )
 {
     d = new TQFontPrivate( *data );
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     d->paintdevice = pd;
 
     // now a single reference
@@ -604,7 +604,7 @@ TQFont::TQFont( const TQString &family, int pointSize, int weight, bool italic )
 {
 
     d = new TQFontPrivate;
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
 
     d->mask = TQFontPrivate::Family;
 
@@ -765,7 +765,7 @@ void TQFont::setPointSizeFloat( float pointSize )
 
     detach();
 
-    d->request.pointSize = qRound(pointSize * 10.0);
+    d->request.pointSize = tqRound(pointSize * 10.0);
     d->request.pixelSize = -1;
 
     d->mask |= TQFontPrivate::Size;
@@ -1403,7 +1403,7 @@ static void initFontSubst()
 	return;
 
     fontSubst = new TQFontSubst(17, FALSE);
-    Q_CHECK_PTR( fontSubst );
+    TQ_CHECK_PTR( fontSubst );
     fontSubst->setAutoDelete( TRUE );
     qfont_cleanup_fontsubst.set(&fontSubst);
 
@@ -1929,7 +1929,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p )
 #if defined(Q_WS_X11)
     if ( d->screen != p->scrn ) {
 	TQFontPrivate *new_d = new TQFontPrivate( *d );
-	Q_CHECK_PTR( new_d );
+	TQ_CHECK_PTR( new_d );
 	d = new_d;
 	d->screen = p->scrn;
 	d->count = 1;
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 82120732e..4e2c6f014 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -355,7 +355,7 @@ void TQFontPrivate::load( TQFont::Script script )
 #endif // QT_CHECK_STATE
 
     TQFontDef req = request;
-    req.pixelSize = qRound(pixelSize(req, paintdevice, screen));
+    req.pixelSize = tqRound(pixelSize(req, paintdevice, screen));
     req.pointSize = 0;
 
     if ( ! engineData ) {
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index 96cc1118b..1138dfefe 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -1238,7 +1238,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
     if ( fp ) {
 #if defined(Q_WS_X11)
         fe->fontDef.pointSize =
-            qRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen));
+            tqRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen));
 #elif defined(Q_WS_WIN)
         fe->fontDef.pointSize     = int( double( fe->fontDef.pixelSize ) * 720.0 /
                                          GetDeviceCaps(shared_dc,LOGPIXELSY) );
@@ -1726,7 +1726,7 @@ TQValueList<int> TQFontDatabase::pointSizes( const TQString &family,
 
 		if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) {
 #ifdef Q_WS_X11
-		    const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+		    const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
 #else
 		    const uint pointSize = size->pixelSize; // embedded uses 72dpi
 #endif
@@ -1827,7 +1827,7 @@ TQValueList<int> TQFontDatabase::smoothSizes( const TQString &family,
 
 		if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) {
 #ifdef Q_WS_X11
-		    const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+		    const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
 #else
 		    const uint pointSize = size->pixelSize; // embedded uses 72dpi
 #endif
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index 9231bf50d..c027bfc41 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -618,7 +618,7 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen )
 	fd->family +=
 	    TQString::fromLatin1(" [") + foundry + TQString::fromLatin1("]");
 
-    if ( qstrlen( tokens[AddStyle] ) > 0 )
+    if ( tqstrlen( tokens[AddStyle] ) > 0 )
 	fd->addStyle = TQString::fromLatin1(tokens[AddStyle]);
     else
 	fd->addStyle = TQString::null;
@@ -638,10 +638,10 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen )
     if ( r && fd->pixelSize && TQPaintDevice::x11AppDpiY( screen ) &&
 	 r != TQPaintDevice::x11AppDpiY( screen ) ) {
 	// calculate actual pointsize for display DPI
-	fd->pointSize = qRound(qt_pointSize(fd->pixelSize, 0, screen) * 10.);
+	fd->pointSize = tqRound(qt_pointSize(fd->pixelSize, 0, screen) * 10.);
     } else if ( fd->pixelSize == 0 && fd->pointSize ) {
 	// calculate pixel size from pointsize/dpi
-	fd->pixelSize = qRound(qt_pixelSize(fd->pointSize / 10., 0, screen));
+	fd->pixelSize = tqRound(qt_pixelSize(fd->pointSize / 10., 0, screen));
     }
 
     return TRUE;
@@ -1977,7 +1977,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef
 
             double px;
             if (XftPatternGetDouble(xft->pattern(), XFT_PIXEL_SIZE, 0, &px) == XftResultMatch)
-                xft->fontDef.pixelSize = qRound(px);
+                xft->fontDef.pixelSize = tqRound(px);
 
             int weight = XFT_WEIGHT_MEDIUM;
             XftPatternGetInteger(xft->pattern(), XFT_WEIGHT, 0, &weight);
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 290e3519d..3802a13c1 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -153,8 +153,8 @@ static void drawScaled(int x, int y, const TQTextEngine *engine, const TQScriptI
                        const TQWMatrix &xmat, float scale)
 {
     // font doesn't support transformations, need to do it by hand
-    int w = qRound(si->width/scale);
-    int h = qRound((si->ascent + si->descent + 1)/scale);
+    int w = tqRound(si->width/scale);
+    int h = tqRound((si->ascent + si->descent + 1)/scale);
     if (w == 0 || h == 0)
         return;
     TQWMatrix mat1 = xmat;
@@ -362,7 +362,7 @@ int TQFontEngineBox::descent() const
 
 int TQFontEngineBox::leading() const
 {
-    int l = qRound( _size * 0.15 );
+    int l = tqRound( _size * 0.15 );
     return (l > 0) ? l : 1;
 }
 
@@ -531,7 +531,7 @@ TQFontEngine::Error TQFontEngineXLFD::stringToCMap( const TQChar *str, int len,
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
     return NoError;
@@ -786,7 +786,7 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( const glyph_t *glyphs, const adva
 	    overall.y = TQMIN( overall.y, y );
 	    xmax = TQMAX( xmax, overall.xoff + offsets[i].x + xcs->rbearing );
 	    ymax = TQMAX( ymax, y + xcs->ascent + xcs->descent );
-	    overall.xoff += qRound(advances[i]/_scale);
+	    overall.xoff += tqRound(advances[i]/_scale);
 	} else {
 	    int size = _fs->ascent;
 	    overall.x = TQMIN(overall.x, overall.xoff );
@@ -800,12 +800,12 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( const glyph_t *glyphs, const adva
     overall.width = xmax - overall.x;
 
     if ( _scale != 1. ) {
-	overall.x = qRound(overall.x * _scale);
-	overall.y = qRound(overall.y * _scale);
-	overall.height = qRound(overall.height * _scale);
-	overall.width = qRound(overall.width * _scale);
-	overall.xoff = qRound(overall.xoff * _scale);
-	overall.yoff = qRound(overall.yoff * _scale);
+	overall.x = tqRound(overall.x * _scale);
+	overall.y = tqRound(overall.y * _scale);
+	overall.height = tqRound(overall.height * _scale);
+	overall.width = tqRound(overall.width * _scale);
+	overall.xoff = tqRound(overall.xoff * _scale);
+	overall.yoff = tqRound(overall.yoff * _scale);
     }
     return overall;
 }
@@ -822,12 +822,12 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( glyph_t glyph )
 	gm = glyph_metrics_t( 0, size, size, size, size, 0 );
     }
     if ( _scale != 1. ) {
-	gm.x = qRound(gm.x * _scale);
-	gm.y = qRound(gm.y * _scale);
-	gm.height = qRound(gm.height * _scale);
-	gm.width = qRound(gm.width * _scale);
-	gm.xoff = qRound(gm.xoff * _scale);
-	gm.yoff = qRound(gm.yoff * _scale);
+	gm.x = tqRound(gm.x * _scale);
+	gm.y = tqRound(gm.y * _scale);
+	gm.height = tqRound(gm.height * _scale);
+	gm.width = tqRound(gm.width * _scale);
+	gm.xoff = tqRound(gm.xoff * _scale);
+	gm.yoff = tqRound(gm.yoff * _scale);
     }
     return gm;
 }
@@ -835,24 +835,24 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( glyph_t glyph )
 
 int TQFontEngineXLFD::ascent() const
 {
-    return qRound(_fs->ascent*_scale);
+    return tqRound(_fs->ascent*_scale);
 }
 
 int TQFontEngineXLFD::descent() const
 {
-    return qRound((_fs->descent-1)*_scale);
+    return tqRound((_fs->descent-1)*_scale);
 }
 
 int TQFontEngineXLFD::leading() const
 {
-    int l = qRound((TQMIN(_fs->ascent, _fs->max_bounds.ascent)
+    int l = tqRound((TQMIN(_fs->ascent, _fs->max_bounds.ascent)
 		    + TQMIN(_fs->descent, _fs->max_bounds.descent)) * _scale * 0.15 );
     return (l > 0) ? l : 1;
 }
 
 int TQFontEngineXLFD::maxCharWidth() const
 {
-    return qRound(_fs->max_bounds.width*_scale);
+    return tqRound(_fs->max_bounds.width*_scale);
 }
 
 
@@ -888,7 +888,7 @@ int TQFontEngineXLFD::minLeftBearing() const
 	} else
 	    ((TQFontEngineXLFD *)this)->lbearing = _fs->min_bounds.lbearing;
     }
-    return qRound (lbearing*_scale);
+    return tqRound (lbearing*_scale);
 }
 
 int TQFontEngineXLFD::minRightBearing() const
@@ -916,7 +916,7 @@ int TQFontEngineXLFD::minRightBearing() const
 	} else
 	    ((TQFontEngineXLFD *)this)->rbearing = _fs->min_bounds.rbearing;
     }
-    return qRound (rbearing*_scale);
+    return tqRound (rbearing*_scale);
 }
 
 int TQFontEngineXLFD::cmap() const
@@ -1628,7 +1628,7 @@ TQFontEngine::Error TQFontEngineXft::stringToCMap( const TQChar *str, int len, g
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
 #else
@@ -1694,7 +1694,7 @@ TQFontEngine::Error TQFontEngineXft::stringToCMap( const TQChar *str, int len, g
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
 #endif // QT_XFT2
@@ -1720,7 +1720,7 @@ void TQFontEngineXft::recalcAdvances( int len, glyph_t *glyphs, advance_t *advan
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
 #else
@@ -1737,7 +1737,7 @@ void TQFontEngineXft::recalcAdvances( int len, glyph_t *glyphs, advance_t *advan
     }
     if ( _scale != 1. ) {
 	for ( int i = 0; i < len; i++ )
-	    advances[i] = qRound(advances[i]*_scale);
+	    advances[i] = tqRound(advances[i]*_scale);
     }
 #endif // QT_XFT2
 }
@@ -2005,14 +2005,14 @@ glyph_metrics_t TQFontEngineXft::boundingBox( const glyph_t *glyphs, const advan
             overall.y = TQMIN( overall.y, y );
             xmax = TQMAX( xmax, x + xgi.width );
             ymax = TQMAX( ymax, y + xgi.height );
-            overall.xoff += qRound(advances[i]/_scale);
+            overall.xoff += tqRound(advances[i]/_scale);
         }
-	overall.x = qRound(overall.x * _scale);
-	overall.y = qRound(overall.y * _scale);
-	overall.xoff = qRound(overall.xoff * _scale);
-	overall.yoff = qRound(overall.yoff * _scale);
-	xmax = qRound(xmax * _scale);
-	ymax = qRound(ymax * _scale);
+	overall.x = tqRound(overall.x * _scale);
+	overall.y = tqRound(overall.y * _scale);
+	overall.xoff = tqRound(overall.xoff * _scale);
+	overall.yoff = tqRound(overall.yoff * _scale);
+	xmax = tqRound(xmax * _scale);
+	ymax = tqRound(ymax * _scale);
     } else {
         for (int i = 0; i < numGlyphs; i++) {
             getGlyphInfo( &xgi, _font, glyphs[i] );
@@ -2036,12 +2036,12 @@ glyph_metrics_t TQFontEngineXft::boundingBox( glyph_t glyph )
     getGlyphInfo( &xgi, _font, glyph );
     glyph_metrics_t gm = glyph_metrics_t( -xgi.x, -xgi.y, xgi.width, xgi.height, xgi.xOff, -xgi.yOff );
     if ( _scale != 1. ) {
-	gm.x = qRound(gm.x * _scale);
-	gm.y = qRound(gm.y * _scale);
-	gm.height = qRound(gm.height * _scale);
-	gm.width = qRound(gm.width * _scale);
-	gm.xoff = qRound(gm.xoff * _scale);
-	gm.yoff = qRound(gm.yoff * _scale);
+	gm.x = tqRound(gm.x * _scale);
+	gm.y = tqRound(gm.y * _scale);
+	gm.height = tqRound(gm.height * _scale);
+	gm.width = tqRound(gm.width * _scale);
+	gm.xoff = tqRound(gm.xoff * _scale);
+	gm.yoff = tqRound(gm.yoff * _scale);
     }
     return gm;
 }
@@ -2050,18 +2050,18 @@ glyph_metrics_t TQFontEngineXft::boundingBox( glyph_t glyph )
 
 int TQFontEngineXft::ascent() const
 {
-    return qRound(_font->ascent*_scale);
+    return tqRound(_font->ascent*_scale);
 }
 
 int TQFontEngineXft::descent() const
 {
-    return qRound((_font->descent-1)*_scale);
+    return tqRound((_font->descent-1)*_scale);
 }
 
 // #### use Freetype to determine this
 int TQFontEngineXft::leading() const
 {
-    int l = qRound(TQMIN( _font->height - (_font->ascent + _font->descent),
+    int l = tqRound(TQMIN( _font->height - (_font->ascent + _font->descent),
 			((_font->ascent + _font->descent) >> 4)*_scale ));
     return (l > 0) ? l : 1;
 }
@@ -2089,7 +2089,7 @@ int TQFontEngineXft::underlinePosition() const
 
 int TQFontEngineXft::maxCharWidth() const
 {
-    return qRound(_font->max_advance_width*_scale);
+    return tqRound(_font->max_advance_width*_scale);
 }
 
 static const ushort char_table[] = {
@@ -2675,15 +2675,15 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters)
             // ###### fix the case where we have y advances. How do we handle this in Uniscribe?????
             if (positions[i].new_advance) {
                 item->advances[i] = item->flags & TQTextEngine::RightToLeft
-                                    ? -qRound((positions[i].x_advance >> 6)*scale) 
-                                    :  qRound((positions[i].x_advance >> 6)*scale);
+                                    ? -tqRound((positions[i].x_advance >> 6)*scale) 
+                                    :  tqRound((positions[i].x_advance >> 6)*scale);
             } else {
                 item->advances[i] += item->flags & TQTextEngine::RightToLeft
-                                     ? -qRound((positions[i].x_advance >> 6)*scale) 
-                                     :  qRound((positions[i].x_advance >> 6)*scale);
+                                     ? -tqRound((positions[i].x_advance >> 6)*scale) 
+                                     :  tqRound((positions[i].x_advance >> 6)*scale);
             }
-	    item->offsets[i].x = qRound((positions[i].x_pos >> 6)*scale);
-	    item->offsets[i].y = -qRound((positions[i].y_pos >> 6)*scale);
+	    item->offsets[i].x = tqRound((positions[i].x_pos >> 6)*scale);
+	    item->offsets[i].y = -tqRound((positions[i].y_pos >> 6)*scale);
             int back = positions[i].back;
             if (item->flags & TQTextEngine::RightToLeft) {
                 while (back--) {
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index 56bd482e0..d904b28c7 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -498,11 +498,11 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth,
     } else {
 	// calloc since we realloc, etc. later (ick)
 	data->ctbl = (TQRgb*)calloc( data->ncols*sizeof(TQRgb), data->ncols );
-        Q_CHECK_PTR(data->ctbl);
+        TQ_CHECK_PTR(data->ctbl);
 	data->ctbl_mine = TRUE;
     }
     uchar** jt = (uchar**)malloc(h*sizeof(uchar*));
-    Q_CHECK_PTR(jt);
+    TQ_CHECK_PTR(jt);
     for (int j=0; j<h; j++) {
 	jt[j] = yourdata+j*bpl;
     }
@@ -548,11 +548,11 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth,
     } else {
 	// calloc since we realloc, etc. later (ick)
 	data->ctbl = (TQRgb*)calloc( numColors*sizeof(TQRgb), numColors );
-        Q_CHECK_PTR(data->ctbl);
+        TQ_CHECK_PTR(data->ctbl);
 	data->ctbl_mine = TRUE;
     }
     uchar** jt = (uchar**)malloc(h*sizeof(uchar*));
-    Q_CHECK_PTR(jt);
+    TQ_CHECK_PTR(jt);
     for (int j=0; j<h; j++) {
 	jt[j] = yourdata+j*bpl;
     }
@@ -1168,7 +1168,7 @@ void TQImage::setNumColors( int numColors )
 		    (numColors-data->ncols)*sizeof(TQRgb) );
     } else {					// create new color table
 	data->ctbl = (TQRgb*)calloc( numColors*sizeof(TQRgb), 1 );
-        Q_CHECK_PTR(data->ctbl);
+        TQ_CHECK_PTR(data->ctbl);
 	data->ctbl_mine = TRUE;
     }
     data->ncols = data->ctbl == 0 ? 0 : numColors;
@@ -1297,7 +1297,7 @@ bool TQImage::create( int width, int height, int depth, int numColors,
     int ptbl   = height*sizeof(uchar*);		// pointer table size
     int size   = nbytes + ptbl;			// total size of data block
     uchar **p  = (uchar **)malloc( size );	// alloc image bits
-    Q_CHECK_PTR(p);
+    TQ_CHECK_PTR(p);
     if ( !p ) {					// no memory
 	setNumColors( 0 );
 	return FALSE;
@@ -1336,7 +1336,7 @@ bool TQImage::create( const TQSize& size, int depth, int numColors,
 void TQImage::init()
 {
     data = new TQImageData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     reinit();
 }
 
@@ -2977,8 +2977,8 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const
     if ( mat.m12() == 0.0F && mat.m21() == 0.0F ) {
 	if ( mat.m11() == 1.0F && mat.m22() == 1.0F ) // identity matrix
 	    return copy();
-	hd = qRound( mat.m22() * hs );
-	wd = qRound( mat.m11() * ws );
+	hd = tqRound( mat.m22() * hs );
+	wd = tqRound( mat.m11() * ws );
 	hd = TQABS( hd );
 	wd = TQABS( wd );
     } else {					// rotation or shearing
@@ -3897,7 +3897,7 @@ void qt_init_image_handlers()		// initialize image handlers
 {
     if ( !imageHandlers ) {
 	imageHandlers = new TQIHList;
-	Q_CHECK_PTR( imageHandlers );
+	TQ_CHECK_PTR( imageHandlers );
 	imageHandlers->setAutoDelete( TRUE );
 	qAddPostRoutine( cleanup );
 #ifndef QT_NO_IMAGEIO_BMP
@@ -4016,7 +4016,7 @@ void TQImageIO::defineIOHandler( const char *format,
     TQImageHandler *p;
     p = new TQImageHandler( format, header, flags,
 			   readImage, writeImage );
-    Q_CHECK_PTR( p );
+    TQ_CHECK_PTR( p );
     imageHandlers->insert( 0, p );
 }
 
@@ -4765,7 +4765,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
     else if ( nbits == 4 ) {			// 4 bit BMP image
 	int    buflen = ((w+7)/8)*4;
 	uchar *buf    = new uchar[buflen];
-	Q_CHECK_PTR( buf );
+	TQ_CHECK_PTR( buf );
 	if ( comp == BMP_RLE4 ) {		// run length compression
 	    int x=0, y=0, b, c, i;
 	    register uchar *p = line[h-1];
@@ -4957,7 +4957,7 @@ static void read_bmp_image( TQImageIO *iio )
     s.setByteOrder( TQDataStream::LittleEndian );// Intel byte order
     s >> bf;					// read BMP file header
 
-    if ( qstrncmp(bf.bfType,"BM",2) != 0 )	// not a BMP image
+    if ( tqstrncmp(bf.bfType,"BM",2) != 0 )	// not a BMP image
 	return;
 
     TQImage image;
@@ -5584,11 +5584,11 @@ static void write_xbm_image( TQImageIO *iio )
     char *buf = new char[s.length() + 100];
 
     sprintf( buf, "#define %s_width %d\n", s.ascii(), w );
-    d->writeBlock( buf, qstrlen(buf) );
+    d->writeBlock( buf, tqstrlen(buf) );
     sprintf( buf, "#define %s_height %d\n", s.ascii(), h );
-    d->writeBlock( buf, qstrlen(buf) );
+    d->writeBlock( buf, tqstrlen(buf) );
     sprintf( buf, "static char %s_bits[] = {\n ", s.ascii() );
-    d->writeBlock( buf, qstrlen(buf) );
+    d->writeBlock( buf, tqstrlen(buf) );
 
     iio->setStatus( 0 );
 
@@ -5627,7 +5627,7 @@ static void write_xbm_image( TQImageIO *iio )
                     *p++ = '\n';
                     *p++ = ' ';
                     *p   = '\0';
-                    if ( (int)qstrlen(buf) != d->writeBlock( buf, qstrlen(buf) ) ) {
+                    if ( (int)tqstrlen(buf) != d->writeBlock( buf, tqstrlen(buf) ) ) {
                         iio->setStatus( 1 );
                         delete [] buf;
                         return;
@@ -5639,7 +5639,7 @@ static void write_xbm_image( TQImageIO *iio )
         }
     }
     strcpy( p, " };\n" );
-    if ( (int)qstrlen(buf) != d->writeBlock( buf, qstrlen(buf) ) )
+    if ( (int)tqstrlen(buf) != d->writeBlock( buf, tqstrlen(buf) ) )
 	iio->setStatus( 1 );
     delete [] buf;
 }
@@ -6082,10 +6082,10 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
     //   - 1 bit, identical palette and byte-aligned area
     //
     if ( haveSamePalette(*dst,*src)
-	 && ( dst->depth() != 1 ||
-	      !( (dx&7) || (sx&7) ||
-		 ((sw&7) && (sx+sw < src->width()) ||
-		  (dx+sw < dst->width()) ) ) ) )
+	 && ( (dst->depth() != 1) ||
+	      (!( (dx&7) || (sx&7) ||
+		 (((sw&7) && (sx+sw < src->width())) ||
+		  (dx+sw < dst->width()) ) )) ) )
 	{
 	    // easy to copy
 	} else if ( dst->depth() != 32 ) {
@@ -6103,7 +6103,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
     // Now assume palette can be ignored
 
     if ( dst->depth() != src->depth() ) {
-	if ( sw == src->width() && sh == src->height() || dst->depth()==32 ) {
+	if ( ((sw == src->width()) && (sh == src->height())) || (dst->depth()==32) ) {
 	    TQImage srcconv = src->convertDepth( dst->depth(), conversion_flags );
 	    bitBlt( dst, dx, dy, &srcconv, sx, sy, sw, sh, conversion_flags );
 	} else {
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index a5884db93..a59fecef1 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -793,7 +793,7 @@ TQString TQInputContext::language()
 }
 
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 /*!
     This is a preliminary interface for TQt4
  */
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index de1832b26..41fbc2bc4 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -488,14 +488,14 @@ void write_jpeg_image(TQImageIO* iio)
 
 	jpeg_set_defaults(&cinfo);
 
-	float diffInch = TQABS(image.dotsPerMeterX()*2.54/100. - qRound(image.dotsPerMeterX()*2.54/100.))
-	                 + TQABS(image.dotsPerMeterY()*2.54/100. - qRound(image.dotsPerMeterY()*2.54/100.));
-	float diffCm = (TQABS(image.dotsPerMeterX()/100. - qRound(image.dotsPerMeterX()/100.))
-	                + TQABS(image.dotsPerMeterY()/100. - qRound(image.dotsPerMeterY()/100.)))*2.54;
+	float diffInch = TQABS(image.dotsPerMeterX()*2.54/100. - tqRound(image.dotsPerMeterX()*2.54/100.))
+	                 + TQABS(image.dotsPerMeterY()*2.54/100. - tqRound(image.dotsPerMeterY()*2.54/100.));
+	float diffCm = (TQABS(image.dotsPerMeterX()/100. - tqRound(image.dotsPerMeterX()/100.))
+	                + TQABS(image.dotsPerMeterY()/100. - tqRound(image.dotsPerMeterY()/100.)))*2.54;
 	if (diffInch < diffCm) {
 	    cinfo.density_unit = 1; // dots/inch
-	    cinfo.X_density = qRound(image.dotsPerMeterX()*2.54/100.);
-	    cinfo.Y_density = qRound(image.dotsPerMeterY()*2.54/100.);
+	    cinfo.X_density = tqRound(image.dotsPerMeterX()*2.54/100.);
+	    cinfo.Y_density = tqRound(image.dotsPerMeterY()*2.54/100.);
 	} else {
 	    cinfo.density_unit = 2; // dots/cm
 	    cinfo.X_density = (image.dotsPerMeterX()+50) / 100;
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index 727b443bf..c50110a16 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -203,7 +203,7 @@ public:
 TQKeySequence::TQKeySequence()
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
 }
 
 /*!
@@ -232,7 +232,7 @@ TQKeySequence::TQKeySequence()
 TQKeySequence::TQKeySequence( const TQString& key )
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     assign( key );
 }
 
@@ -248,7 +248,7 @@ TQKeySequence::TQKeySequence( const TQString& key )
 TQKeySequence::TQKeySequence( int key )
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     d->key[0] = key;
 }
 
@@ -263,7 +263,7 @@ TQKeySequence::TQKeySequence( int key )
 TQKeySequence::TQKeySequence( int k1, int k2, int k3, int k4 )
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     d->key[0] = k1;
     d->key[1] = k2;
     d->key[2] = k3;
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index df9229ed8..11960dba1 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -433,7 +433,7 @@ void TQGridLayoutData::setSize( int r, int c )
 void TQGridLayoutData::setNextPosAfter( int row, int col )
 {
     if ( addVertical ) {
-	if ( col > nextC || col == nextC && row >= nextR ) {
+	if ( (col > nextC) || ((col == nextC) && (row >= nextR)) ) {
 	    nextR = row + 1;
 	    nextC = col;
 	    if ( nextR >= rr ) {
@@ -442,7 +442,7 @@ void TQGridLayoutData::setNextPosAfter( int row, int col )
 	    }
 	}
     } else {
-	if ( row > nextR || row == nextR && col >= nextC ) {
+	if ( (row > nextR) || ((row == nextR) && (col >= nextC)) ) {
 	    nextR = row;
 	    nextC = col + 1;
 	    if ( nextC >= cc ) {
@@ -1398,7 +1398,7 @@ void TQGridLayout::setColStretch( int col, int stretch )
     data->setColStretch( col, stretch );
 }
 
-#if QT_VERSION >= 0x040000
+#if TQT_VERSION >= 0x040000
 #error "Make add{Row,Col}Spacing() inline QT_NO_COMPAT functions defined in terms of set{Row,Col}Spacing()"
 #endif
 
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index d9e6a152c..5cdb20522 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -511,7 +511,7 @@ TQMemberDict *TQMetaObject::init( const TQMetaData * data, int n )
     if ( n == 0 )				// nothing, then make no dict
 	return 0;
     TQMemberDict *dict = new TQMemberDict( optDictSize(n), TRUE, FALSE );
-    Q_CHECK_PTR( dict );
+    TQ_CHECK_PTR( dict );
     while ( n-- ) {				// put all members into dict
 	dict->insert( data->name, data );
 	data++;
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 431660674..3c6e634ec 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -130,7 +130,7 @@
 class TQMoviePrivate : public TQObject, public TQShared,
 		      private TQDataSink, private TQImageConsumer
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public: // for TQMovie
 
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 619308be3..abe951b1c 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -148,7 +148,7 @@ public:
     Last but not least, TQObject provides the basic timer support in
     TQt; see TQTimer for high-level support for timers.
 
-    Notice that the Q_OBJECT macro is mandatory for any object that
+    Notice that the TQ_OBJECT macro is mandatory for any object that
     implements signals, slots or properties. You also need to run the
     \link moc.html moc program (Meta Object Compiler) \endlink on the
     source file. We strongly recommend the use of this macro in \e all
@@ -194,7 +194,7 @@ static inline bool isSpace( char x )
 
 static TQCString qt_rmWS( const char *s )
 {
-    TQCString result( qstrlen(s)+1 );
+    TQCString result( tqstrlen(s)+1 );
     char *d = result.data();
     char last = 0;
     while( *s && isSpace(*s) )			// skip leading space
@@ -537,7 +537,7 @@ TQObject::~TQObject()
 
     A meta object contains information about a class that inherits
     TQObject, e.g. class name, superclass name, properties, signals and
-    slots. Every class that contains the Q_OBJECT macro will also have
+    slots. Every class that contains the TQ_OBJECT macro will also have
     a meta object.
 
     The meta object information is required by the signal/slot
@@ -554,7 +554,7 @@ TQObject::~TQObject()
     Object Compiler. \endlink
 
     \warning This function will return the wrong name if the class
-    definition lacks the Q_OBJECT macro.
+    definition lacks the TQ_OBJECT macro.
 
     \sa name(), inherits(), isA(), isWidgetType()
 */
@@ -987,7 +987,7 @@ void TQObject::blockSignals( bool block )
     \code
     class MyObject : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	MyObject( TQObject *parent = 0, const char *name = 0 );
 
@@ -1198,7 +1198,7 @@ TQObjectList *TQObject::queryList( const char *inheritsClass,
 				 bool recursiveSearch ) const
 {
     TQObjectList *list = new TQObjectList;
-    Q_CHECK_PTR( list );
+    TQ_CHECK_PTR( list );
     bool onlyWidgets = ( inheritsClass && qstrcmp(inheritsClass, "TQWidget") == 0 );
 #ifndef QT_NO_REGEXP
     if ( regexpMatch && objName ) {		// regexp matching
@@ -1290,7 +1290,7 @@ void TQObject::insertChild( TQObject *obj )
 
     if ( !childObjects ) {
 	childObjects = new TQObjectList;
-	Q_CHECK_PTR( childObjects );
+	TQ_CHECK_PTR( childObjects );
     } else if ( obj->parentObj == this ) {
 #if defined(QT_CHECK_STATE)
 	qWarning( "TQObject::insertChild: Object %s::%s already in list",
@@ -1409,7 +1409,7 @@ void TQObject::installEventFilter( const TQObject *obj )
 		    this, SLOT(cleanupEventFilter(TQObject*)) );
     } else {
 	eventFilters = new TQObjectList;
-	Q_CHECK_PTR( eventFilters );
+	TQ_CHECK_PTR( eventFilters );
     }
     eventFilters->insert( 0, obj );
     connect( obj, SIGNAL(destroyed(TQObject*)), this, SLOT(cleanupEventFilter(TQObject*)) );
@@ -1644,9 +1644,9 @@ bool TQObject::checkConnectArgs( const char    *signal,
     while ( *s2++ != '(' ) { }
     if ( *s2 == ')' || qstrcmp(s1,s2) == 0 )	// member has no args or
 	return TRUE;				//   exact match
-    int s1len = qstrlen(s1);
-    int s2len = qstrlen(s2);
-    if ( s2len < s1len && qstrncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',' )
+    int s1len = tqstrlen(s1);
+    int s2len = tqstrlen(s2);
+    if ( s2len < s1len && tqstrncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',' )
 	return TRUE;				// member has less args
     return FALSE;
 }
@@ -1702,7 +1702,7 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot )
     \code
     class MyWidget : public TQWidget
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	MyWidget();
 
@@ -1874,14 +1874,14 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
 
     if ( !s->connections ) {			// create connections lookup table
 	s->connections = new TQSignalVec( signal_index+1 );
-	Q_CHECK_PTR( s->connections );
+	TQ_CHECK_PTR( s->connections );
 	s->connections->setAutoDelete( TRUE );
     }
 
     TQConnectionList *clist = s->connections->at( signal_index );
     if ( !clist ) {				// create receiver list
 	clist = new TQConnectionList;
-	Q_CHECK_PTR( clist );
+	TQ_CHECK_PTR( clist );
 	clist->setAutoDelete( TRUE );
 	s->connections->insert( signal_index, clist );
     }
@@ -1899,7 +1899,7 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
     }
 
     TQConnection *c = new TQConnection( r, member_index, rm ? rm->name : "qt_invoke", membcode );
-    Q_CHECK_PTR( c );
+    TQ_CHECK_PTR( c );
     clist->append( c );
     if ( !r->senderObjects )			// create list of senders
 	r->senderObjects = new TQSenderObjectList;
@@ -2113,8 +2113,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 		    success = TRUE;
 		    c = clist->next();
 		} else if ( r == c->object() &&
-			    ( member_index == -1 ||
-			      member_index == c->member() && c->memberType() == membcode ) ) {
+			    ( (member_index == -1) ||
+			      ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		    removeObjFromList( c->object()->senderObjects, s, TRUE );
 		    success = TRUE;
 		    clist->remove();
@@ -2138,8 +2138,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 		success = TRUE;
 		c = clist->next();
 	    } else if ( r == c->object() &&
-			( member_index == -1 ||
-			  member_index == c->member() && c->memberType() == membcode ) ) {
+			( (member_index == -1) ||
+			  ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		removeObjFromList( c->object()->senderObjects, s, TRUE );
 		success = TRUE;
 		clist->remove();
@@ -2209,7 +2209,7 @@ void TQObject::cleanupEventFilter(TQObject* obj)
     Returns a translated version of \a sourceText, or \a sourceText
     itself if there is no appropriate translated version. The
     translation context is TQObject with \a comment (0 by default).
-    All TQObject subclasses using the Q_OBJECT macro automatically have
+    All TQObject subclasses using the TQ_OBJECT macro automatically have
     a reimplementation of this function with the subclass name as
     context.
 
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index aefd8971a..e3a2617e6 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -526,8 +526,8 @@ static void create_dpis()
     int i, screens =  ScreenCount( dpy );
     dpisX = new int[ screens ];
     dpisY = new int[ screens ];
-    Q_CHECK_PTR( dpisX );
-    Q_CHECK_PTR( dpisY );
+    TQ_CHECK_PTR( dpisX );
+    TQ_CHECK_PTR( dpisY );
     for ( i = 0; i < screens; i++ ) {
 	dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
 
@@ -881,7 +881,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 	    }
 	} else if ( ts == TQInternal::Widget ) {// bitBlt to temp pixmap
 	    pm = new TQPixmap( sw, sh );
-	    Q_CHECK_PTR( pm );
+	    TQ_CHECK_PTR( pm );
 	    bitBlt( pm, 0, 0, src, sx, sy, sw, sh );
 	} else {
 #if defined(QT_CHECK_RANGE)
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index d0d069702..64a11c0bb 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -713,12 +713,12 @@ void TQPainter::save()
     TQPStateStack *pss = (TQPStateStack *)ps_stack;
     if ( pss == 0 ) {
 	pss = new TQPtrStack<TQPState>;
-	Q_CHECK_PTR( pss );
+	TQ_CHECK_PTR( pss );
 	pss->setAutoDelete( TRUE );
 	ps_stack = pss;
     }
     TQPState *ps = new TQPState;
-    Q_CHECK_PTR( ps );
+    TQ_CHECK_PTR( ps );
     ps->font  = cfont;
     ps->pen   = cpen;
     ps->curPt = pos();
@@ -838,7 +838,7 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement )
         if ( replacement == 0 )
             return;
         pdev_dict = new TQPaintDeviceDict;
-        Q_CHECK_PTR( pdev_dict );
+        TQ_CHECK_PTR( pdev_dict );
     }
 #if defined(QT_CHECK_NULL)
     if ( pdev == 0 )
@@ -1475,7 +1475,7 @@ void TQPainter::saveWorldMatrix()
     TQWMatrixStack *stack = (TQWMatrixStack *)wm_stack;
     if ( stack == 0 ) {
 	stack  = new TQPtrStack<TQWMatrix>;
-	Q_CHECK_PTR( stack );
+	TQ_CHECK_PTR( stack );
 	stack->setAutoDelete( TRUE );
 	wm_stack = stack;
     }
@@ -1721,16 +1721,16 @@ void TQPainter::map( int x, int y, int *rx, int *ry ) const
 		*ry = y;
 		break;
 	    case TxTranslate:
-		*rx = qRound( x + dx() );
-		*ry = qRound( y + dy() );
+		*rx = tqRound( x + dx() );
+		*ry = tqRound( y + dy() );
 		break;
 	    case TxScale:
-		*rx = qRound( m11()*x + dx() );
-		*ry = qRound( m22()*y + dy() );
+		*rx = tqRound( m11()*x + dx() );
+		*ry = tqRound( m22()*y + dy() );
 		break;
 	    default:
-		*rx = qRound( m11()*x + m21()*y+dx() );
-		*ry = qRound( m12()*x + m22()*y+dy() );
+		*rx = tqRound( m11()*x + m21()*y+dx() );
+		*ry = tqRound( m12()*x + m22()*y+dy() );
 		break;
 	}
     }
@@ -1767,10 +1767,10 @@ void TQPainter::map( int x, int y, int w, int h,
 		double ty1 = m22()*y + dy();
 		double tx2 = m11()*(x + w - 1) + dx();
 		double ty2 = m22()*(y + h - 1) + dy();
-		*rx = qRound( tx1 );
-		*ry = qRound( ty1 );
-		*rw = qRound( tx2 ) - *rx + 1;
-		*rh = qRound( ty2 ) - *ry + 1;
+		*rx = tqRound( tx1 );
+		*ry = tqRound( ty1 );
+		*rw = tqRound( tx2 ) - *rx + 1;
+		*rh = tqRound( ty2 ) - *ry + 1;
 	    } break;
 	    default:
 #if defined(QT_CHECK_STATE)
@@ -1785,15 +1785,15 @@ void TQPainter::map( int x, int y, int w, int h,
 		*rw = w;  *rh = h;
 		break;
 	    case TxTranslate:
-		*rx = qRound(x + dx() );
-		*ry = qRound(y + dy() );
+		*rx = tqRound(x + dx() );
+		*ry = tqRound(y + dy() );
 		*rw = w;  *rh = h;
 		break;
 	    case TxScale:
-		*rx = qRound( m11()*x + dx() );
-		*ry = qRound( m22()*y + dy() );
-		*rw = qRound( m11()*w );
-		*rh = qRound( m22()*h );
+		*rx = tqRound( m11()*x + dx() );
+		*ry = tqRound( m22()*y + dy() );
+		*rw = tqRound( m11()*w );
+		*rh = tqRound( m22()*h );
 		break;
 	    default:
 #if defined(QT_CHECK_STATE)
@@ -1827,8 +1827,8 @@ void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const
 	*rx = tx >= 0 ? int(tx + 0.5) : int(tx - 0.5);
 	*ry = ty >= 0 ? int(ty + 0.5) : int(ty - 0.5);
     } else {
-	*rx = qRound( im11()*x + im21()*y + idx() );
-	*ry = qRound( im12()*x + im22()*y + idy() );
+	*rx = tqRound( im11()*x + im21()*y + idx() );
+	*ry = tqRound( im12()*x + im22()*y + idy() );
     }
 #else
     *rx = x - xlatex;
@@ -1860,10 +1860,10 @@ void TQPainter::mapInv( int x, int y, int w, int h,
 	*rw = tw >= 0 ? int(tw + 0.5) : int(tw - 0.5);
 	*rh = th >= 0 ? int(th + 0.5) : int(th - 0.5);
     } else {
-	*rx = qRound( im11()*x + idx() );
-	*ry = qRound( im22()*y + idy() );
-	*rw = qRound( im11()*w );
-	*rh = qRound( im22()*h );
+	*rx = tqRound( im11()*x + idx() );
+	*ry = tqRound( im22()*y + idy() );
+	*rw = tqRound( im11()*w );
+	*rh = tqRound( im22()*h );
     }
 #else
     *rx = x - xlatex;
@@ -3216,7 +3216,7 @@ TQRect TQPainter::boundingRect( const TQRect &r, int flags,
 void TQPen::init( const TQColor &color, uint width, uint linestyle )
 {
     data = new TQPenData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->style = (PenStyle)(linestyle & MPenStyle);
     data->width = width;
     data->color = color;
@@ -3619,7 +3619,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPen &p )
 void TQBrush::init( const TQColor &color, BrushStyle style )
 {
     data = new TQBrushData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->style	 = style;
     data->color	 = color;
     data->pixmap = 0;
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 6214dc3b4..f88f03801 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -205,11 +205,11 @@ const double Q_PI2  = 1.57079632679489661923;   // pi/2
 
 #if defined(Q_CC_GNU) && defined(Q_OS_AIX)
 // AIX 4.2 gcc 2.7.2.3 gets internal error.
-static int qRoundAIX( double d )
+static int tqRoundAIX( double d )
 {
-    return qRound(d);
+    return tqRound(d);
 }
-#define qRound qRoundAIX
+#define tqRound tqRoundAIX
 #endif
 
 
@@ -959,7 +959,7 @@ void TQPainter::updateBrush()
             bool del = FALSE;
             if ( !pm ) {                        // not already in pm dict
                 pm = new TQBitmap( d, d, pat, TRUE );
-                Q_CHECK_PTR( pm );
+                TQ_CHECK_PTR( pm );
                 del = !TQPixmapCache::insert( key, pm );
             }
             if ( cbrush.data->pixmap )
@@ -2187,12 +2187,12 @@ void TQPainter::drawPie( int x, int y, int w, int h, int a, int alen )
         double yc = (double)y+h2;
         double ra1 = Q_PI/2880.0*a;             // convert a, alen to radians
         double ra2 = ra1 + Q_PI/2880.0*alen;
-        int xic = qRound(xc);
-        int yic = qRound(yc);
+        int xic = tqRound(xc);
+        int yic = tqRound(yc);
         XDrawLine( dpy, hd, g, xic, yic,
-                   qRound(xc + qcos(ra1)*w2), qRound(yc - qsin(ra1)*h2));
+                   tqRound(xc + qcos(ra1)*w2), tqRound(yc - qsin(ra1)*h2));
         XDrawLine( dpy, hd, g, xic, yic,
-                   qRound(xc + qcos(ra2)*w2), qRound(yc - qsin(ra2)*h2));
+                   tqRound(xc + qcos(ra2)*w2), tqRound(yc - qsin(ra2)*h2));
         XDrawArc( dpy, hd, g, x, y, w, h, a*4, alen*4 );
     }
 }
@@ -2264,8 +2264,8 @@ void TQPainter::drawChord( int x, int y, int w, int h, int a, int alen )
         double ra1 = Q_PI/2880.0*a;             // convert a, alen to radians
         double ra2 = ra1 + Q_PI/2880.0*alen;
         XDrawLine( dpy, hd, g,
-                   qRound(xc + qcos(ra1)*w2), qRound(yc - qsin(ra1)*h2),
-                   qRound(xc + qcos(ra2)*w2), qRound(yc - qsin(ra2)*h2));
+                   tqRound(xc + qcos(ra1)*w2), tqRound(yc - qsin(ra1)*h2),
+                   tqRound(xc + qcos(ra2)*w2), tqRound(yc - qsin(ra2)*h2));
         XDrawArc( dpy, hd, g, x, y, w, h, a*4, alen*4 );
     }
     XSetArcMode( dpy, gc_brush, ArcPieSlice );
@@ -3138,7 +3138,7 @@ void TQPainter::drawTextItem( int x,  int y, const TQTextItem &ti, int textFlags
     fe->draw( this, x,  y, engine, si, textFlags );
 }
 
-#if QT_VERSION >= 0x040000
+#if TQT_VERSION >= 0x040000
 #error "remove current position and associated methods"
 #endif
 /*!
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index 3821306c0..51947caa6 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -621,7 +621,7 @@ TQPalette::TQPalette()
 TQPalette::TQPalette( const TQColor &button )
 {
     data = new TQPalData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->ser_no = palette_count++;
     TQColor bg = button, btn = button, fg, base, disfg;
     int h, s, v;
@@ -651,7 +651,7 @@ TQPalette::TQPalette( const TQColor &button )
 TQPalette::TQPalette( const TQColor &button, const TQColor &background )
 {
     data = new TQPalData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->ser_no = palette_count++;
     TQColor bg = background, btn = button, fg, base, disfg;
     int h, s, v;
@@ -686,7 +686,7 @@ TQPalette::TQPalette( const TQColorGroup &active, const TQColorGroup &disabled,
 		    const TQColorGroup &inactive )
 {
     data = new TQPalData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->ser_no = palette_count++;
     data->active = active;
     data->disabled = disabled;
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index aeb0f56e0..f7c60ad3b 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -612,7 +612,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords )
 		    painter->setTabArray( 0 );
 		} else {
 		    int *ta = new int[i_16];
-		    Q_CHECK_PTR( ta );
+		    TQ_CHECK_PTR( ta );
 		    for ( int i=0; i<i_16; i++ ) {
 			s >> i1_16;
 			ta[i] = i1_16;
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index ca1490a5a..c03ac42f6 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -1384,8 +1384,8 @@ bool qt_xForm_helper( const TQWMatrix &trueMat, int xoffset,
     int m12 = int(trueMat.m12()*65536.0 + 1.);
     int m21 = int(trueMat.m21()*65536.0 + 1.);
     int m22 = int(trueMat.m22()*65536.0 + 1.);
-    int dx  = qRound(trueMat.dx() *65536.0);
-    int dy  = qRound(trueMat.dy() *65536.0);
+    int dx  = tqRound(trueMat.dx() *65536.0);
+    int dy  = tqRound(trueMat.dy() *65536.0);
 
     int m21ydx = dx + (xoffset<<16);
     int m22ydy = dy;
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index 4040b055a..2322214cc 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -422,7 +422,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim )
 	optim = defOptim;
 
     data = new TQPixmapData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
 
     memset( data, 0, sizeof(TQPixmapData) );
     data->count  = 1;
@@ -747,7 +747,7 @@ TQImage TQPixmap::convertToImage() const
 	xi = XGetImage( x11Display(), hd, 0, 0, w, h, AllPlanes,
 			mono ? XYPixmap : ZPixmap );
     }
-    Q_CHECK_PTR( xi );
+    TQ_CHECK_PTR( xi );
     if (!xi)
         return image; // null image
 
@@ -1180,7 +1180,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	int    ibpl = image.bytesPerLine();
 	if ( image.bitOrder() == TQImage::BigEndian || bpl != ibpl ) {
 	    tmp_bits = new uchar[bpl*h];
-	    Q_CHECK_PTR( tmp_bits );
+	    TQ_CHECK_PTR( tmp_bits );
 	    bits = (char *)tmp_bits;
 	    uchar *p, *b, *end;
 	    uint y, count;
@@ -1287,7 +1287,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
             return false;
 	if( newbits == NULL )
 	newbits = (uchar *)malloc( xi->bytes_per_line*h );
-	Q_CHECK_PTR( newbits );
+	TQ_CHECK_PTR( newbits );
 	if ( !newbits )				// no memory
 	    return FALSE;
 	int    bppc = xi->bits_per_pixel;
@@ -1614,7 +1614,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 
 	newbits = (uchar *)malloc( nbytes );	// copy image into newbits
         newbits_size = nbytes;
-	Q_CHECK_PTR( newbits );
+	TQ_CHECK_PTR( newbits );
 	if ( !newbits )				// no memory
 	    return FALSE;
 	uchar* p = newbits;
@@ -1650,7 +1650,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	PIX *px		   = &pixarr[0];
 	int  maxpop = 0;
 	int  maxpix = 0;
-	Q_CHECK_PTR( pixarr );
+	TQ_CHECK_PTR( pixarr );
 	uint j = 0;
 	TQRgb* ctable = image.colorTable();
 	for ( i=0; i<256; i++ ) {		// init pixel array
@@ -1743,7 +1743,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	    int	    p2inc = xi->bytes_per_line/sizeof(ushort);
 	    ushort *newerbits = (ushort *)malloc( xi->bytes_per_line * h );
             newbits_size = xi->bytes_per_line * h;
-	    Q_CHECK_PTR( newerbits );
+	    TQ_CHECK_PTR( newerbits );
 	    if ( !newerbits )				// no memory
 		return FALSE;
 	    uchar* p = newbits;
@@ -1868,7 +1868,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 		if( axi->data==NULL ) {
 		// the data is deleted by qSafeXDestroyImage
                 axi->data = (char *) malloc(h * axi->bytes_per_line);
-		Q_CHECK_PTR( axi->data );
+		TQ_CHECK_PTR( axi->data );
 		}
                 char *aptr = axi->data;
 
@@ -2075,8 +2075,8 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 	    return *this;			// identity matrix
 	scaledHeight = matrix.m22()*hs;
 	scaledWidth = matrix.m11()*ws;
-	h = TQABS( qRound( scaledHeight ) );
-	w = TQABS( qRound( scaledWidth ) );
+	h = TQABS( tqRound( scaledHeight ) );
+	w = TQABS( tqRound( scaledWidth ) );
     } else {					// rotation or shearing
 	TQPointArray a( TQRect(0,0,ws+1,hs+1) );
 	a = mat.map( a );
@@ -2142,7 +2142,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
     } else {
 #endif
 	dptr = (uchar *)malloc( dbytes );	// create buffer for bits
-	Q_CHECK_PTR( dptr );
+	TQ_CHECK_PTR( dptr );
 	if ( depth1 )				// fill with zeros
 	    memset( dptr, 0, dbytes );
 	else if ( bpp == 8 )			// fill with background color
@@ -2243,7 +2243,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 		bpp  = axi->bits_per_pixel;
 		dbytes = dbpl * h;
 		dptr = (uchar *) malloc(dbytes);
-		Q_CHECK_PTR( dptr );
+		TQ_CHECK_PTR( dptr );
 		memset(dptr, 0, dbytes);
 		if ( axi->bitmap_bit_order == MSBFirst )
 		    type = QT_XFORM_TYPE_MSBFIRST;
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index f29e0402c..d2256bb66 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -244,7 +244,7 @@ bool TQPixmapCache::insert( const TQString &key, TQPixmap *pm )
 {
     if ( !pm_cache ) {				// create pixmap cache
 	pm_cache = new TQPMCache;
-	Q_CHECK_PTR( pm_cache );
+	TQ_CHECK_PTR( pm_cache );
 	qpm_cleanup_cache.set( &pm_cache );
     }
     return pm_cache->insert( key, pm, pm->width()*pm->height()*pm->depth()/8 );
@@ -271,7 +271,7 @@ bool TQPixmapCache::insert( const TQString &key, const TQPixmap& pm )
 {
     if ( !pm_cache ) {				// create pixmap cache
 	pm_cache = new TQPMCache;
-	Q_CHECK_PTR( pm_cache );
+	TQ_CHECK_PTR( pm_cache );
 	qpm_cleanup_cache.set( &pm_cache );
     }
     TQPixmap *p = new TQPixmap(pm);
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index eee32c438..c4a5c9979 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -1280,7 +1280,7 @@ int TQPNGFormat::user_chunk(png_structp png,
 	return 1;
     } else if ( 0==qstrcmp((char*)png->chunk_name, "gIFx")
 	    && length == 13 ) {
-	if ( qstrncmp((char*)data,"NETSCAPE2.0",11)==0 ) {
+	if ( tqstrncmp((char*)data,"NETSCAPE2.0",11)==0 ) {
 	    int looping = (data[0xC]<<8)|data[0xB];
 	    consumer->setLooping(looping);
 	    return 1;
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index 3258a4415..6a9d3748d 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -955,8 +955,8 @@ TQPointArray TQPointArray::cubicBezier() const
     m -= 2;
 
     while ( m-- ) {
-	pd->rx() = (TQCOORD)qRound( ((ax * t + bx) * t + cx) * t + x0 );
-	pd->ry() = (TQCOORD)qRound( ((ay * t + by) * t + cy) * t + y0 );
+	pd->rx() = (TQCOORD)tqRound( ((ax * t + bx) * t + cx) * t + x0 );
+	pd->ry() = (TQCOORD)tqRound( ((ay * t + by) * t + cy) * t + y0 );
 	pd++;
 	t += dt;
     }
@@ -988,8 +988,8 @@ TQPointArray TQPointArray::cubicBezier() const
 	TQPointArray pa((len/2)+1); // one extra point for last point on line
 	int j=0;
 	for (i=0; j<len; i++) {
-	    int x = qRound(p[j++]);
-	    int y = qRound(p[j++]);
+	    int x = tqRound(p[j++]);
+	    int y = tqRound(p[j++]);
 	    pa[i] = TQPoint(x,y);
 	}
 	// add last pt on the line, which will be at the last control pt
diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp
index 3dd79b99c..9597010f7 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/qprinter.cpp
@@ -973,13 +973,16 @@ TQPrinter::PaperSource TQPrinter::paperSource() const
 */
 void TQPrinter::setPrintRange( PrintRange range )
 {
-    if( range != AllPages )
+    if( range != AllPages ) {
 	if( range == Selection
-	    && !isOptionEnabled( PrintSelection ) )
+	    && !isOptionEnabled( PrintSelection ) ) {
 	    setOptionEnabled( PrintSelection, TRUE );
+	}
 	else if( range == PageRange
-		 && !isOptionEnabled( PrintPageRange ) )
+		 && !isOptionEnabled( PrintPageRange ) ) {
 	    setOptionEnabled( PrintPageRange, TRUE );
+	}
+    }
     d->printRange = range;
 }
 
diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp
index 64262960a..17786eac2 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/qprocess.cpp
@@ -730,7 +730,7 @@ void TQProcess::closeStdinLaunch()
 void TQProcess::writeToStdin( const TQString& buf )
 {
     TQByteArray tmp = buf.local8Bit();
-    tmp.resize( qstrlen( tmp.data() ) );
+    tmp.resize( tqstrlen( tmp.data() ) );
     writeToStdin( tmp );
 }
 
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 1c2e0b9f5..41260d53e 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -176,7 +176,7 @@ public:
  **********************************************************************/
 class TQProcessManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQProcessManager();
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index f52b43710..1fc1190a7 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -5901,7 +5901,7 @@ void TQPSPrinterPrivate::emitHeader( bool finished )
     TQString title = printer->docName();
     TQString creator = printer->creator();
     if ( !creator )                             // default creator
-        creator = TQString::fromLatin1("TQt " QT_VERSION_STR);
+        creator = TQString::fromLatin1("TQt " TQT_VERSION_STR);
     outDevice = new TQFile();
     (void)((TQFile *)outDevice)->open( IO_WriteOnly, fd );
     outStream.setDevice( outDevice );
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 2094a00c7..3cd7d3436 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -2435,7 +2435,7 @@ TQRegion::TQRegion()
     if ( !empty_region ) {			// avoid too many allocs
 	qAddPostRoutine( cleanup_empty_region );
 	empty_region = new TQRegion( TRUE );
-	Q_CHECK_PTR( empty_region );
+	TQ_CHECK_PTR( empty_region );
     }
     data = empty_region->data;
     data->ref();
@@ -2448,7 +2448,7 @@ TQRegion::TQRegion()
 TQRegion::TQRegion( bool is_null )
 {
     data = new TQRegionData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->region = new TQRegionPrivate;
     data->is_null = is_null;
     data->rgn = 0;
@@ -2471,13 +2471,13 @@ TQRegion::TQRegion( const TQRect &r, RegionType t )
 	if ( !empty_region ) {			// avoid too many allocs
 	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new TQRegion( TRUE );
-	    Q_CHECK_PTR( empty_region );
+	    TQ_CHECK_PTR( empty_region );
 	}
 	data = empty_region->data;
 	data->ref();
     } else {
 	data = new TQRegionData;
-	Q_CHECK_PTR( data );
+	TQ_CHECK_PTR( data );
 	data->is_null = FALSE;
 	data->rgn = 0;
 	data->xrectangles = 0;
@@ -2508,7 +2508,7 @@ TQRegion::TQRegion( const TQPointArray &a, bool winding )
 {
     if (a.size() > 2) {
 	data = new TQRegionData;
-	Q_CHECK_PTR( data );
+	TQ_CHECK_PTR( data );
 	data->is_null = FALSE;
 	data->rgn = 0;
 	data->xrectangles = 0;
@@ -2518,7 +2518,7 @@ TQRegion::TQRegion( const TQPointArray &a, bool winding )
 	if ( !empty_region ) {
 	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new TQRegion( TRUE );
-	    Q_CHECK_PTR( empty_region );
+	    TQ_CHECK_PTR( empty_region );
 	}
 	data = empty_region->data;
 	data->ref();
@@ -2553,13 +2553,13 @@ TQRegion::TQRegion( const TQBitmap & bm )
 	if ( !empty_region ) {			// avoid too many allocs
 	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new TQRegion( TRUE );
-	    Q_CHECK_PTR( empty_region );
+	    TQ_CHECK_PTR( empty_region );
 	}
 	data = empty_region->data;
 	data->ref();
     } else {
 	data = new TQRegionData;
-	Q_CHECK_PTR( data );
+	TQ_CHECK_PTR( data );
 	data->is_null = FALSE;
 	data->rgn = 0;
 	data->xrectangles = 0;
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 7c5453b55..8bac2e018 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -774,7 +774,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQTextDocument>;
 
 class Q_EXPORT TQTextDocument : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 #ifndef QT_NO_TEXTCUSTOMITEM
     friend class TQTextTableCell;
@@ -1040,7 +1040,7 @@ private:
     double scaleFontsFactor;
 
     short list_tm,list_bm, list_lm, li_tm, li_bm, par_tm, par_bm;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextDocument( const TQTextDocument & );
     TQTextDocument &operator=( const TQTextDocument & );
 #endif
diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/qsimplerichtext.cpp
index 20bea6af4..e9fd7f1d4 100644
--- a/src/kernel/qsimplerichtext.cpp
+++ b/src/kernel/qsimplerichtext.cpp
@@ -244,8 +244,8 @@ void TQSimpleRichText::setWidth( TQPainter *p, int w )
     if ( w == d->cachedWidth  && d->cachedWidthWithPainter )
 	return;
     d->doc->formatter()->setAllowBreakInWords( d->doc->isPageBreakEnabled() ||
-		       p && p->device() &&
-		     p->device()->devType() == TQInternal::Printer );
+		       (p && p->device() &&
+		     (p->device()->devType() == TQInternal::Printer)) );
     p->save();
     d->cachedWidth = w;
     d->cachedWidthWithPainter = TRUE;
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 59f6d0a0e..692e89e50 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -87,7 +87,7 @@ public:
 };
 
 class TQAuServerNAS : public TQAuServer {
-    Q_OBJECT
+    TQ_OBJECT
 
     TQSocketNotifier* sn;
 
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h
index d9619e290..74cca1890 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/qtextengine_p.h
@@ -284,7 +284,7 @@ public:
 
     TQScriptItemArrayPrivate *d;
 private:
-#ifdef Q_DISABLE_COPY
+#ifdef TQ_DISABLE_COPY
     TQScriptItemArray( const TQScriptItemArray & );
     TQScriptItemArray &operator = ( const TQScriptItemArray & );
 #endif
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index 24239dbd9..f9c45d92c 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -47,7 +47,7 @@
 #  include "ntqapplication.h"
 #endif // QT_H
 
-#if QT_VERSION >= 0x040000
+#if TQT_VERSION >= 0x040000
 #  error "Remove TQThread::TQThread() and TQThread::start()."
 #endif
 
diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp
index 13bd9bba7..ed8098999 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/qtimer.cpp
@@ -245,7 +245,7 @@ static void sst_init()
 {
     if ( !sst_list ) {
 	sst_list = new TQObjectList;
-	Q_CHECK_PTR( sst_list );
+	TQ_CHECK_PTR( sst_list );
 	qAddPostRoutine( sst_cleanup );
     }
 }
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 015b6cdb8..18d3c839a 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -826,7 +826,7 @@ void TQTranslator::squeeze( SaveMode mode )
 	    } else {
 		hTable[i] = (Q_UINT16) ( upto >> 1 );
 		do {
-		    uint len = (uint) qstrlen( con );
+		    uint len = (uint) tqstrlen( con );
 		    len = TQMIN( len, 255 );
 		    t << (Q_UINT8) len;
 		    t.writeRawBytes( con, len );
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index 9bcf665b0..16bce332f 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -1019,7 +1019,7 @@ int TQWidget::maxInstances = 0;     // Maximum number of widget instances
 void TQWidget::createMapper()
 {
     mapper = new TQWidgetMapper;
-    Q_CHECK_PTR( mapper );
+    TQ_CHECK_PTR( mapper );
 }
 
 /*!
@@ -1048,7 +1048,7 @@ void TQWidget::destroyMapper()
 static TQWidgetList *wListInternal( TQWidgetMapper *mapper, bool onlyTopLevel )
 {
     TQWidgetList *list = new TQWidgetList;
-    Q_CHECK_PTR( list );
+    TQ_CHECK_PTR( list );
     if ( mapper ) {
 	TQWidget *w;
 	TQWidgetIntDictIt it( *((TQWidgetIntDict*)mapper) );
@@ -1167,7 +1167,7 @@ void TQWidget::createExtra()
 {
     if ( !extra ) {				// if not exists
 	extra = new TQWExtra;
-	Q_CHECK_PTR( extra );
+	TQ_CHECK_PTR( extra );
 	extra->minw = extra->minh = 0;
 	extra->maxw = extra->maxh = TQWIDGETSIZE_MAX;
 	extra->bg_pix = 0;
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 9fc3e7d05..da6ec4817 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -667,13 +667,13 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	wm_hints.flags |= WindowGroupHint;
 
 	XClassHint class_hint;
-	class_hint.res_name = (char *) qAppName(); // application name
+	class_hint.res_name = (char *) tqAppName(); // application name
 	class_hint.res_class = (char *) qAppClass();	// application class
 
        	XSetWMProperties( dpy, id, 0, 0, 0, 0, &size_hints, &wm_hints, &class_hint );
 
 	XResizeWindow( dpy, id, crect.width(), crect.height() );
-	XStoreName( dpy, id, qAppName() );
+	XStoreName( dpy, id, tqAppName() );
 	Atom protocols[5];
 	int n = 0;
 	protocols[n++] = qt_wm_delete_window;	// support del window protocol
@@ -728,7 +728,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	// declare the widget's object name as window role
 	XChangeProperty( dpy, id,
 			 qt_window_role, XA_STRING, 8, PropModeReplace,
-			 (unsigned char *)name(), qstrlen( name() ) );
+			 (unsigned char *)name(), tqstrlen( name() ) );
 
 	// set client leader property
 	XChangeProperty( dpy, id, qt_wm_client_leader,
@@ -1171,7 +1171,7 @@ void TQWidget::setBackgroundPixmapDirect( const TQPixmap &pixmap )
 	else
 	    createExtra();
 	extra->bg_pix = new TQPixmap( pm );
-	Q_CHECK_PTR( extra->bg_pix );
+	TQ_CHECK_PTR( extra->bg_pix );
 	extra->bg_pix->x11SetScreen( x11Screen() );
 	XSetWindowBackgroundPixmap( x11Display(), winId(), extra->bg_pix->handle() );
 	if ( testWFlags(WType_Desktop) )	// save rootinfo later
@@ -2766,7 +2766,7 @@ void TQWidget::setName( const char *name )
     if ( isTopLevel() ) {
 	XChangeProperty( x11Display(), winId(),
 			 qt_window_role, XA_STRING, 8, PropModeReplace,
-			 (unsigned char *)name, qstrlen( name ) );
+			 (unsigned char *)name, tqstrlen( name ) );
     }
 }
 
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index e85cb00cf..10a7c93fa 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -246,8 +246,8 @@ TQWMatrix::TransformationMode TQWMatrix::transformationMode()
 { \
     double fx = x; \
     double fy = y; \
-    nx = qRound(_m11*fx + _m21*fy + _dx); \
-    ny = qRound(_m12*fx + _m22*fy + _dy); \
+    nx = tqRound(_m11*fx + _m21*fy + _dx); \
+    ny = tqRound(_m12*fx + _m22*fy + _dy); \
 }
 
 /*****************************************************************************
@@ -447,10 +447,10 @@ TQRect TQWMatrix::mapRect( const TQRect &rect ) const
 	}
     } else {
 	if ( _m12 == 0.0F && _m21 == 0.0F ) {
-	    int x = qRound( _m11*rect.x() + _dx );
-	    int y = qRound( _m22*rect.y() + _dy );
-	    int w = qRound( _m11*rect.width() );
-	    int h = qRound( _m22*rect.height() );
+	    int x = tqRound( _m11*rect.x() + _dx );
+	    int y = tqRound( _m22*rect.y() + _dy );
+	    int w = tqRound( _m11*rect.width() );
+	    int h = tqRound( _m22*rect.height() );
 	    if ( w < 0 ) {
 		w = -w;
 		x -= w-1;
@@ -491,7 +491,7 @@ TQRect TQWMatrix::mapRect( const TQRect &rect ) const
 	    ymin -= ( ymin - y0 ) / h;
 	    xmax -= ( xmax - x0 ) / w;
 	    ymax -= ( ymax - y0 ) / h;
-	    result = TQRect( qRound(xmin), qRound(ymin), qRound(xmax)-qRound(xmin)+1, qRound(ymax)-qRound(ymin)+1 );
+	    result = TQRect( tqRound(xmin), tqRound(ymin), tqRound(xmax)-tqRound(xmin)+1, tqRound(ymax)-tqRound(ymin)+1 );
 	}
     }
     return result;
@@ -505,8 +505,8 @@ TQPoint TQWMatrix::operator *( const TQPoint &p ) const
 {
     double fx = p.x();
     double fy = p.y();
-    return TQPoint( qRound(_m11*fx + _m21*fy + _dx),
-		   qRound(_m12*fx + _m22*fy + _dy) );
+    return TQPoint( tqRound(_m11*fx + _m21*fy + _dx),
+		   tqRound(_m12*fx + _m22*fy + _dy) );
 }
 
 
@@ -580,8 +580,8 @@ TQPointArray TQWMatrix::operator *( const TQPointArray &a ) const
 	TQPointArray result( size );
 	TQPoint *dr = result.data();
 	for( i = 0; i < size; i++ ) {
-	    dr[i].setX( qRound( dp[i].x - (dp[i].x - dp[xminp].x)/w ) );
-	    dr[i].setY( qRound( dp[i].y - (dp[i].y - dp[yminp].y)/h ) );
+	    dr[i].setX( tqRound( dp[i].x - (dp[i].x - dp[xminp].x)/w ) );
+	    dr[i].setY( tqRound( dp[i].y - (dp[i].y - dp[yminp].y)/h ) );
 	}
 	return result;
     }
@@ -599,10 +599,10 @@ TQRegion TQWMatrix::operator * (const TQRect &rect ) const
 	if( qt_old_transformations ) {
 	    result = TQRect( map(rect.topLeft()), map(rect.bottomRight()) ).normalize();
 	} else {
-	    int x = qRound( _m11*rect.x() + _dx );
-	    int y = qRound( _m22*rect.y() + _dy );
-	    int w = qRound( _m11*rect.width() );
-	    int h = qRound( _m22*rect.height() );
+	    int x = tqRound( _m11*rect.x() + _dx );
+	    int y = tqRound( _m22*rect.y() + _dy );
+	    int w = tqRound( _m11*rect.width() );
+	    int h = tqRound( _m22*rect.height() );
 	    if ( w < 0 ) {
 		w = -w;
 		x -= w - 1;
@@ -637,10 +637,10 @@ TQPointArray TQWMatrix::mapToPolygon( const TQRect &rect ) const
     }
     double x[4], y[4];
     if ( _m12 == 0.0F && _m21 == 0.0F ) {
-	x[0] = qRound( _m11*rect.x() + _dx );
-        y[0] = qRound( _m22*rect.y() + _dy );
-	double w = qRound( _m11*rect.width() );
-	double h = qRound( _m22*rect.height() );
+	x[0] = tqRound( _m11*rect.x() + _dx );
+        y[0] = tqRound( _m22*rect.y() + _dy );
+	double w = tqRound( _m11*rect.width() );
+	double h = tqRound( _m22*rect.height() );
 	if ( w < 0 ) {
 	    w = -w;
 	    x[0] -= w - 1.;
@@ -702,16 +702,16 @@ TQPointArray TQWMatrix::mapToPolygon( const TQRect &rect ) const
 #if 0
     int i;
     for( i = 0; i< 4; i++ )
-	qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], qRound(x[i]), qRound(y[i]) );
+	qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], tqRound(x[i]), tqRound(y[i]) );
     qDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ),
 	    sqrt( (x[0]-x[3])*(x[0]-x[3]) + (y[0]-y[3])*(y[0]-y[3]) ) );
 #endif
     // all coordinates are correctly, tranform to a pointarray
     // (rounding to the next integer)
-    a.setPoints( 4, qRound( x[0] ), qRound( y[0] ),
-		 qRound( x[1] ), qRound( y[1] ),
-		 qRound( x[2] ), qRound( y[2] ),
-		 qRound( x[3] ), qRound( y[3] ) );
+    a.setPoints( 4, tqRound( x[0] ), tqRound( y[0] ),
+		 tqRound( x[1] ), tqRound( y[1] ),
+		 tqRound( x[2] ), tqRound( y[2] ),
+		 tqRound( x[3] ), tqRound( y[3] ) );
     return a;
 }
 
@@ -729,10 +729,10 @@ TQRegion TQWMatrix::operator * (const TQRegion &r ) const
     if ( _m12 == 0.0F && _m21 == 0.0F && _m11 > 1.0F && _m22 > 1.0F ) {
 	// simple case, no rotation
 	while ( i ) {
-	    int x = qRound( _m11*rect->x() + _dx );
-	    int y = qRound( _m22*rect->y() + _dy );
-	    int w = qRound( _m11*rect->width() );
-	    int h = qRound( _m22*rect->height() );
+	    int x = tqRound( _m11*rect->x() + _dx );
+	    int y = tqRound( _m22*rect->y() + _dy );
+	    int w = tqRound( _m11*rect->width() );
+	    int h = tqRound( _m22*rect->height() );
 	    if ( w < 0 ) {
 		w = -w;
 		x -= w-1;