Automated update from Qt3

77 files changed, 180 insertions, 180 deletions

diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h
index 4811d6bfc..919ba22ef 100644
--- a/src/widgets/ntqaction.h
+++ b/src/widgets/ntqaction.h
@@ -58,7 +58,7 @@ class TQToolTipGroup;
 
 class Q_EXPORT TQAction : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction)
     Q_PROPERTY( bool on READ isOn WRITE setOn )
     Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
@@ -145,7 +145,7 @@ private:
     friend class TQActionGroupPrivate;
     TQActionPrivate* d;
 
-#if defined(Q_DISABLE_COPY)  // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY)  // Disabled copy constructor and operator=
     TQAction( const TQAction & );
     TQAction &operator=( const TQAction & );
 #endif
@@ -153,7 +153,7 @@ private:
 
 class Q_EXPORT TQActionGroup : public TQAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
     Q_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown )
 
@@ -207,7 +207,7 @@ public:
 #endif
 
 private:
-#if defined(Q_DISABLE_COPY)  // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY)  // Disabled copy constructor and operator=
     TQActionGroup( const TQActionGroup & );
     TQActionGroup &operator=( const TQActionGroup & );
 #endif
diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h
index 17dcdd260..ce5f85e4d 100644
--- a/src/widgets/ntqbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -55,7 +55,7 @@ class TQButtonData;
 
 class Q_EXPORT TQButton : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ToggleType ToggleState )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
@@ -164,7 +164,7 @@ private:
     void	nextState();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQButton( const TQButton & );
     TQButton &operator=( const TQButton & );
 #endif
diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/ntqbuttongroup.h
index 155c6a763..466e578f0 100644
--- a/src/widgets/ntqbuttongroup.h
+++ b/src/widgets/ntqbuttongroup.h
@@ -54,7 +54,7 @@ class TQButtonList;
 
 class Q_EXPORT TQButtonGroup : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
     Q_PROPERTY( bool radioButtonExclusive READ isRadioButtonExclusive WRITE setRadioButtonExclusive )
     Q_PROPERTY( int selectedId READ selectedId WRITE setButton )
@@ -109,7 +109,7 @@ private:
     TQButtonList *buttons;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQButtonGroup( const TQButtonGroup & );
     TQButtonGroup &operator=( const TQButtonGroup & );
 #endif
diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/ntqcheckbox.h
index 16a2b7a7a..e51107769 100644
--- a/src/widgets/ntqcheckbox.h
+++ b/src/widgets/ntqcheckbox.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQCheckBox : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
     Q_PROPERTY( bool tristate READ isTristate WRITE setTristate )
     Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
@@ -77,7 +77,7 @@ protected:
     void    updateMask();
     bool    hitButton( const TQPoint &pos ) const;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCheckBox( const TQCheckBox & );
     TQCheckBox &operator=( const TQCheckBox & );
 #endif
diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h
index 0b5eb95d7..9ab4e3a35 100644
--- a/src/widgets/ntqcombobox.h
+++ b/src/widgets/ntqcombobox.h
@@ -58,7 +58,7 @@ class TQWheelEvent;
 
 class Q_EXPORT TQComboBox : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Policy )
     Q_PROPERTY( bool editable READ editable WRITE setEditable )
     Q_PROPERTY( int count READ count )
@@ -194,7 +194,7 @@ private:
     TQComboBoxData	*d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQComboBox( const TQComboBox & );
     TQComboBox &operator=( const TQComboBox & );
 #endif
diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h
index 86b8db22b..e53273f28 100644
--- a/src/widgets/ntqdatetimeedit.h
+++ b/src/widgets/ntqdatetimeedit.h
@@ -51,7 +51,7 @@
 
 class Q_EXPORT TQDateTimeEditBase : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDateTimeEditBase( TQWidget* parent=0, const char* name=0 )
 	: TQWidget( parent, name ) {}
@@ -66,7 +66,7 @@ public slots:
     virtual void stepDown() = 0;
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDateTimeEditBase( const TQDateTimeEditBase & );
     TQDateTimeEditBase &operator=( const TQDateTimeEditBase & );
 #endif
@@ -76,7 +76,7 @@ class TQDateEditPrivate;
 
 class Q_EXPORT TQDateEdit : public TQDateTimeEditBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Order )
     Q_PROPERTY( Order order READ order WRITE setOrder )
     Q_PROPERTY( TQDate date READ date WRITE setDate )
@@ -146,7 +146,7 @@ private:
     TQString sectionText( int sec ) const;
     TQDateEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDateEdit( const TQDateEdit & );
     TQDateEdit &operator=( const TQDateEdit & );
 #endif
@@ -156,7 +156,7 @@ class TQTimeEditPrivate;
 
 class Q_EXPORT TQTimeEdit : public TQDateTimeEditBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_SETS( Display )
     Q_PROPERTY( TQTime time READ time WRITE setTime )
     Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance )
@@ -229,7 +229,7 @@ private:
     TQString sectionText( int sec );
     TQTimeEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTimeEdit( const TQTimeEdit & );
     TQTimeEdit &operator=( const TQTimeEdit & );
 #endif
@@ -240,7 +240,7 @@ class TQDateTimeEditPrivate;
 
 class Q_EXPORT TQDateTimeEdit : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
 
 public:
@@ -283,7 +283,7 @@ private:
     TQTimeEdit* te;
     TQDateTimeEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDateTimeEdit( const TQDateTimeEdit & );
     TQDateTimeEdit &operator=( const TQDateTimeEdit & );
 #endif
diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h
index 8fd34772d..2fd25d94e 100644
--- a/src/widgets/ntqdial.h
+++ b/src/widgets/ntqdial.h
@@ -53,7 +53,7 @@ class TQDialPrivate;
 
 class Q_EXPORT TQDial: public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
     Q_PROPERTY( bool wrapping READ wrapping WRITE setWrapping )
     Q_PROPERTY( int notchSize READ notchSize )
@@ -141,7 +141,7 @@ private:
     void calcLines();
 
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDial( const TQDial & );
     TQDial &operator=( const TQDial & );
 #endif
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index 2c68842de..7ce03c1c3 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -62,7 +62,7 @@ class TQDockAreaPrivate;
 
 class Q_EXPORT TQDockAreaLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQDockArea;
 
 public:
@@ -97,7 +97,7 @@ private:
     TQWidget *parentWidget;
     TQValueList<TQRect> lines;
     TQPtrList<TQDockWindow> ls;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDockAreaLayout( const TQDockAreaLayout & );
     TQDockAreaLayout &operator=( const TQDockAreaLayout & );
 #endif
@@ -105,7 +105,7 @@ private:
 
 class Q_EXPORT TQDockArea : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( HandlePosition )
     Q_PROPERTY( Orientation orientation READ orientation )
     Q_PROPERTY( int count READ count )
@@ -172,7 +172,7 @@ private:
     TQDockAreaPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDockArea( const TQDockArea & );
     TQDockArea& operator=( const TQDockArea & );
 #endif
diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h
index 405a507d3..96e417b94 100644
--- a/src/widgets/ntqdockwindow.h
+++ b/src/widgets/ntqdockwindow.h
@@ -64,7 +64,7 @@ class TQWindowsXPStyle;
 
 class Q_EXPORT TQDockWindow : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( CloseMode Place )
     Q_PROPERTY( int closeMode READ closeMode  WRITE setCloseMode ) //### this shouldn't be of type int?!
     Q_PROPERTY( bool resizeEnabled READ isResizeEnabled  WRITE setResizeEnabled )
@@ -219,7 +219,7 @@ private:
     TQDockWindowPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDockWindow( const TQDockWindow & );
     TQDockWindow& operator=( const TQDockWindow & );
 #endif
diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h
index e157ea1ad..21a1cbe45 100644
--- a/src/widgets/ntqframe.h
+++ b/src/widgets/ntqframe.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQFrame : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Shape Shadow )
     Q_PROPERTY( int frameWidth READ frameWidth )
     Q_PROPERTY( TQRect contentsRect READ contentsRect )
@@ -131,7 +131,7 @@ private:
 
     void * d;
 private:        // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFrame( const TQFrame & );
     TQFrame &operator=( const TQFrame & );
 #endif
diff --git a/src/widgets/ntqgrid.h b/src/widgets/ntqgrid.h
index d28eb6d58..c557fa990 100644
--- a/src/widgets/ntqgrid.h
+++ b/src/widgets/ntqgrid.h
@@ -47,7 +47,7 @@ class TQGridLayout;
 
 class Q_EXPORT TQGrid : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGrid( int n, TQWidget* parent=0, const char* name=0, WFlags f = 0 );
     TQGrid( int n, Orientation orient, TQWidget* parent=0, const char* name=0,
@@ -66,7 +66,7 @@ protected:
 private:
     TQGridLayout *lay;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGrid( const TQGrid & );
     TQGrid& operator=( const TQGrid & );
 #endif
diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h
index 5e4cd604c..e15816894 100644
--- a/src/widgets/ntqgridview.h
+++ b/src/widgets/ntqgridview.h
@@ -51,7 +51,7 @@ class TQGridViewPrivate;
 
 class Q_EXPORT TQGridView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
     Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
     Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
@@ -101,7 +101,7 @@ private:
     TQGridViewPrivate* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGridView( const TQGridView & );
     TQGridView &operator=( const TQGridView & );
 #endif
diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h
index 602788c15..bd4ef3548 100644
--- a/src/widgets/ntqgroupbox.h
+++ b/src/widgets/ntqgroupbox.h
@@ -56,7 +56,7 @@ class TQSpacerItem;
 
 class Q_EXPORT TQGroupBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString title READ title WRITE setTitle )
     Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false )
@@ -153,7 +153,7 @@ private:
     int spac, marg;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGroupBox( const TQGroupBox & );
     TQGroupBox &operator=( const TQGroupBox & );
 #endif
diff --git a/src/widgets/ntqhbox.h b/src/widgets/ntqhbox.h
index 3d46ee304..57fd2ba99 100644
--- a/src/widgets/ntqhbox.h
+++ b/src/widgets/ntqhbox.h
@@ -50,7 +50,7 @@ class TQBoxLayout;
 
 class Q_EXPORT TQHBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHBox( TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
@@ -65,7 +65,7 @@ protected:
 private:
     TQBoxLayout *lay;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHBox( const TQHBox & );
     TQHBox &operator=( const TQHBox & );
 #endif
diff --git a/src/widgets/ntqhbuttongroup.h b/src/widgets/ntqhbuttongroup.h
index 1f0000897..c5f59ffdb 100644
--- a/src/widgets/ntqhbuttongroup.h
+++ b/src/widgets/ntqhbuttongroup.h
@@ -49,14 +49,14 @@
 
 class Q_EXPORT TQHButtonGroup : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHButtonGroup( TQWidget* parent=0, const char* name=0 );
     TQHButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 );
     ~TQHButtonGroup();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHButtonGroup( const TQHButtonGroup & );
     TQHButtonGroup &operator=( const TQHButtonGroup & );
 #endif
diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h
index 4ebe46c94..09a2ce359 100644
--- a/src/widgets/ntqheader.h
+++ b/src/widgets/ntqheader.h
@@ -59,7 +59,7 @@ class Q_EXPORT TQHeader : public TQWidget
     friend class TQTableHeader;
     friend class TQListView;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
     Q_PROPERTY( int count READ count )
@@ -197,7 +197,7 @@ private:
     TQHeaderData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHeader( const TQHeader & );
     TQHeader &operator=( const TQHeader & );
 #endif
diff --git a/src/widgets/ntqhgroupbox.h b/src/widgets/ntqhgroupbox.h
index 401432ba2..73d33e28f 100644
--- a/src/widgets/ntqhgroupbox.h
+++ b/src/widgets/ntqhgroupbox.h
@@ -49,14 +49,14 @@
 
 class Q_EXPORT TQHGroupBox : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHGroupBox( TQWidget* parent=0, const char* name=0 );
     TQHGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 );
     ~TQHGroupBox();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHGroupBox( const TQHGroupBox & );
     TQHGroupBox &operator=( const TQHGroupBox & );
 #endif
diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h
index c2d6ca352..5e978931f 100644
--- a/src/widgets/ntqlabel.h
+++ b/src/widgets/ntqlabel.h
@@ -52,7 +52,7 @@ class TQLabelPrivate;
 
 class Q_EXPORT TQLabel : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
@@ -162,7 +162,7 @@ private:
     friend class TQTipLabel;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLabel( const TQLabel & );
     TQLabel &operator=( const TQLabel & );
 #endif
diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h
index a936b3e1b..01d216ce2 100644
--- a/src/widgets/ntqlcdnumber.h
+++ b/src/widgets/ntqlcdnumber.h
@@ -53,7 +53,7 @@ class TQLCDNumberPrivate;
 
 class Q_EXPORT TQLCDNumber : public TQFrame		// LCD number widget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Mode SegmentStyle )
     Q_PROPERTY( bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint )
     Q_PROPERTY( int numDigits READ numDigits WRITE setNumDigits )
@@ -128,7 +128,7 @@ private:
     TQLCDNumberPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLCDNumber( const TQLCDNumber & );
     TQLCDNumber &operator=( const TQLCDNumber & );
 #endif
diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h
index dad904b7c..8067cfbaf 100644
--- a/src/widgets/ntqlineedit.h
+++ b/src/widgets/ntqlineedit.h
@@ -58,7 +58,7 @@ class TQTextCursor;
 
 class Q_EXPORT TQLineEdit : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( EchoMode )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( int maxLength READ maxLength WRITE setMaxLength )
@@ -220,7 +220,7 @@ private:
     TQLineEditPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLineEdit( const TQLineEdit & );
     TQLineEdit &operator=( const TQLineEdit & );
 #endif
diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h
index a7764791d..91cece44e 100644
--- a/src/widgets/ntqlistbox.h
+++ b/src/widgets/ntqlistbox.h
@@ -61,7 +61,7 @@ class Q_EXPORT TQListBox : public TQScrollView
     friend class TQListBoxItem;
     friend class TQListBoxPrivate;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode LayoutMode )
     Q_PROPERTY( uint count READ count )
     Q_PROPERTY( int numItemsVisible READ numItemsVisible )
@@ -308,7 +308,7 @@ private:
     static TQListBox * changedListBox;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBox( const TQListBox & );
     TQListBox &operator=( const TQListBox & );
 #endif
@@ -366,7 +366,7 @@ private:
     friend class TQComboBoxPopupItem;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxItem( const TQListBoxItem & );
     TQListBoxItem &operator=( const TQListBoxItem & );
 #endif
@@ -391,7 +391,7 @@ protected:
     void  paint( TQPainter * );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxText( const TQListBoxText & );
     TQListBoxText &operator=( const TQListBoxText & );
 #endif
@@ -423,7 +423,7 @@ protected:
 private:
     TQPixmap pm;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxPixmap( const TQListBoxPixmap & );
     TQListBoxPixmap &operator=( const TQListBoxPixmap & );
 #endif
diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h
index 61efac96f..e647152a3 100644
--- a/src/widgets/ntqlistview.h
+++ b/src/widgets/ntqlistview.h
@@ -240,7 +240,7 @@ class Q_EXPORT TQListView: public TQScrollView
     friend class TQCheckListItem;
     friend class TQListViewToolTip;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode ResizeMode RenameAction )
     Q_PROPERTY( int columns READ columns )
     Q_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false )
@@ -460,7 +460,7 @@ private:
     TQListViewPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListView( const TQListView & );
     TQListView &operator=( const TQListView & );
 #endif
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h
index 14ec3b5e4..9cd213b9c 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -59,7 +59,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQMainWindow: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false )
     Q_PROPERTY( bool usesBigPixmaps READ usesBigPixmaps WRITE setUsesBigPixmaps )
     Q_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel )
@@ -202,7 +202,7 @@ private:
     friend class TQToolBar;
     friend class TQMainWindowLayout;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMainWindow( const TQMainWindow & );
     TQMainWindow& operator=( const TQMainWindow & );
 #endif
diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h
index ae2be8d1e..46468d8ab 100644
--- a/src/widgets/ntqmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -53,7 +53,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQMenuBar : public TQFrame, public TQMenuData
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Separator )
     Q_PROPERTY( Separator separator READ separator WRITE setSeparator DESIGNABLE false )
     Q_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp )
@@ -193,7 +193,7 @@ private:
 
 private:	// Disabled copy constructor and operator=
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuBar( const TQMenuBar & );
     TQMenuBar &operator=( const TQMenuBar & );
 #endif
diff --git a/src/widgets/ntqmenudata.h b/src/widgets/ntqmenudata.h
index fa6d860ee..0048c5ba5 100644
--- a/src/widgets/ntqmenudata.h
+++ b/src/widgets/ntqmenudata.h
@@ -112,7 +112,7 @@ private:
     TQMenuItemData* extra();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuItem( const TQMenuItem & );
     TQMenuItem &operator=( const TQMenuItem & );
 #endif
@@ -274,7 +274,7 @@ private:
     TQMenuDataData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuData( const TQMenuData & );
     TQMenuData &operator=( const TQMenuData & );
 #endif
diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h
index 08b0c9519..88d33601d 100644
--- a/src/widgets/ntqmultilineedit.h
+++ b/src/widgets/ntqmultilineedit.h
@@ -53,7 +53,7 @@ class TQMultiLineEditData;
 
 class Q_EXPORT TQMultiLineEdit : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int numLines READ numLines )
     Q_PROPERTY( bool atBeginning READ atBeginning )
     Q_PROPERTY( bool atEnd READ atEnd )
@@ -130,7 +130,7 @@ private:
     TQMultiLineEditData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMultiLineEdit( const TQMultiLineEdit & );
     TQMultiLineEdit &operator=( const TQMultiLineEdit & );
 #endif
diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h
index d3b114b1a..af67e914e 100644
--- a/src/widgets/ntqpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -51,7 +51,7 @@ class TQPopupMenuPrivate;
 
 class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
 public:
     TQPopupMenu( TQWidget* parent=0, const char* name=0 );
@@ -189,7 +189,7 @@ private:
     void connectModal(TQPopupMenu* receiver, bool doConnect);
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPopupMenu( const TQPopupMenu & );
     TQPopupMenu &operator=( const TQPopupMenu & );
 #endif
diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/ntqprogressbar.h
index b848235c4..038ddf83c 100644
--- a/src/widgets/ntqprogressbar.h
+++ b/src/widgets/ntqprogressbar.h
@@ -53,7 +53,7 @@ class TQProgressBarPrivate;
 
 class Q_EXPORT TQProgressBar : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
     Q_PROPERTY( int progress READ progress WRITE setProgress )
     Q_PROPERTY( TQString progressString READ progressString )
@@ -107,7 +107,7 @@ private:
     void         initFrame();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQProgressBar( const TQProgressBar & );
     TQProgressBar &operator=( const TQProgressBar & );
 #endif
diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/ntqpushbutton.h
index 9f74aae31..e8a317a5d 100644
--- a/src/widgets/ntqpushbutton.h
+++ b/src/widgets/ntqpushbutton.h
@@ -52,7 +52,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQPushButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( bool autoDefault READ autoDefault WRITE setAutoDefault )
     Q_PROPERTY( bool default READ isDefault WRITE setDefault )
@@ -137,7 +137,7 @@ private:
     friend class TQDialog;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPushButton( const TQPushButton & );
     TQPushButton &operator=( const TQPushButton & );
 #endif
diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/ntqradiobutton.h
index 9ceb30782..cfeefa272 100644
--- a/src/widgets/ntqradiobutton.h
+++ b/src/widgets/ntqradiobutton.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQRadioButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
     Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
@@ -76,7 +76,7 @@ private:
     void    init();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRadioButton( const TQRadioButton & );
     TQRadioButton &operator=( const TQRadioButton & );
 #endif
diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/ntqrangecontrol.h
index 940711cce..7cc2cc3bf 100644
--- a/src/widgets/ntqrangecontrol.h
+++ b/src/widgets/ntqrangecontrol.h
@@ -96,7 +96,7 @@ private:
     TQRangeControlPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRangeControl( const TQRangeControl & );
     TQRangeControl &operator=( const TQRangeControl & );
 #endif
@@ -129,7 +129,7 @@ inline int TQRangeControl::pageStep() const
 class TQSpinWidgetPrivate;
 class Q_EXPORT TQSpinWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSpinWidget( TQWidget* parent=0, const char* name=0 );
     ~TQSpinWidget();
@@ -183,7 +183,7 @@ private:
     void updateDisplay();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSpinWidget( const TQSpinWidget& );
     TQSpinWidget& operator=( const TQSpinWidget& );
 #endif
diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h
index be9229015..a14d3ce0b 100644
--- a/src/widgets/ntqscrollbar.h
+++ b/src/widgets/ntqscrollbar.h
@@ -52,7 +52,7 @@ class TQTimer;
 
 class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
     Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
@@ -159,7 +159,7 @@ private:
     void * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQScrollBar( const TQScrollBar & );
     TQScrollBar &operator=( const TQScrollBar & );
 #endif
diff --git a/src/widgets/ntqscrollview.h b/src/widgets/ntqscrollview.h
index 2de0e6a5b..b2b0869a0 100644
--- a/src/widgets/ntqscrollview.h
+++ b/src/widgets/ntqscrollview.h
@@ -51,7 +51,7 @@ class TQScrollViewData;
 
 class Q_EXPORT TQScrollView : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ResizePolicy ScrollBarMode )
     Q_PROPERTY( ResizePolicy resizePolicy READ resizePolicy WRITE setResizePolicy )
     Q_PROPERTY( ScrollBarMode vScrollBarMode READ vScrollBarMode WRITE setVScrollBarMode )
@@ -253,7 +253,7 @@ private slots:
 #endif
 
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQScrollView( const TQScrollView & );
     TQScrollView &operator=( const TQScrollView & );
 #endif
diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h
index 2a87d3bf3..881e2abb2 100644
--- a/src/widgets/ntqslider.h
+++ b/src/widgets/ntqslider.h
@@ -54,7 +54,7 @@ class TQTimer;
 
 class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TickSetting )
     Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
@@ -168,7 +168,7 @@ private:
     Orientation orient;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSlider( const TQSlider & );
     TQSlider &operator=( const TQSlider & );
 #endif
diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h
index df4a15421..deb0fd50b 100644
--- a/src/widgets/ntqspinbox.h
+++ b/src/widgets/ntqspinbox.h
@@ -54,7 +54,7 @@ class TQSpinBoxPrivate;
 
 class Q_EXPORT TQSpinBox: public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ButtonSymbols )
     Q_PROPERTY( TQString text READ text )
     Q_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
@@ -160,7 +160,7 @@ private:
     void arrangeWidgets();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSpinBox( const TQSpinBox& );
     TQSpinBox& operator=( const TQSpinBox& );
 #endif
diff --git a/src/widgets/ntqsplashscreen.h b/src/widgets/ntqsplashscreen.h
index 10c4e5c6d..a369ffc5e 100644
--- a/src/widgets/ntqsplashscreen.h
+++ b/src/widgets/ntqsplashscreen.h
@@ -49,7 +49,7 @@ class TQSplashScreenPrivate;
 
 class Q_EXPORT TQSplashScreen : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSplashScreen( const TQPixmap &pixmap = TQPixmap(), WFlags f = 0 );
     virtual ~TQSplashScreen();
diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h
index 8e05120e1..1a3742c32 100644
--- a/src/widgets/ntqsplitter.h
+++ b/src/widgets/ntqsplitter.h
@@ -69,7 +69,7 @@ public:
     int handleWidth;
 };
 
-class TQSplitterLayoutStruct : public TQt
+class Q_EXPORT TQSplitterLayoutStruct : public TQt
 {
 public:
     TQCOORD sizer;
@@ -85,7 +85,7 @@ public:
 
 class Q_EXPORT TQSplitter : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize )
     Q_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth )
@@ -179,7 +179,7 @@ public: //private:
     friend class TQTextStream;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSplitter( const TQSplitter & );
     TQSplitter& operator=( const TQSplitter & );
 #endif
@@ -190,9 +190,9 @@ Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& );
 Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& );
 #endif
 
-class TQSplitterHandle : public TQWidget
+class Q_EXPORT TQSplitterHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSplitterHandle( Orientation o,
 		     TQSplitter *parent, const char* name=0 );
diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h
index 1402b2ff7..53eb8ad52 100644
--- a/src/widgets/ntqstatusbar.h
+++ b/src/widgets/ntqstatusbar.h
@@ -53,7 +53,7 @@ class TQStatusBarPrivate;
 
 class Q_EXPORT TQStatusBar: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
 
 public:
@@ -85,7 +85,7 @@ protected:
 private:
     TQStatusBarPrivate * d;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStatusBar( const TQStatusBar & );
     TQStatusBar& operator=( const TQStatusBar & );
 #endif
diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h
index 5428e4c92..2172f8bed 100644
--- a/src/widgets/ntqtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -87,7 +87,7 @@ struct TQTabPrivate;
 
 class Q_EXPORT TQTabBar: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Shape )
     Q_PROPERTY( Shape shape READ shape WRITE setShape )
     Q_PROPERTY( int currentTab READ currentTab WRITE setCurrentTab )
@@ -174,7 +174,7 @@ private:
     friend class TQTab;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabBar( const TQTabBar & );
     TQTabBar& operator=( const TQTabBar & );
 #endif
diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h
index 439eadf0a..c599d278d 100644
--- a/src/widgets/ntqtabwidget.h
+++ b/src/widgets/ntqtabwidget.h
@@ -56,7 +56,7 @@ class TQWidgetStack;
 
 class Q_EXPORT TQTabWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TabPosition )
     Q_ENUMS( TabShape )
     Q_PROPERTY( TabPosition tabPosition READ tabPosition WRITE setTabPosition )
@@ -151,7 +151,7 @@ private:
     friend class TQTabDialog;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabWidget( const TQTabWidget & );
     TQTabWidget& operator=( const TQTabWidget & );
 #endif
diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h
index c9a3e5f58..6f3f1babf 100644
--- a/src/widgets/ntqtextbrowser.h
+++ b/src/widgets/ntqtextbrowser.h
@@ -54,7 +54,7 @@ class TQTextBrowserData;
 
 class Q_EXPORT TQTextBrowser : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString source READ source WRITE setSource )
     Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
@@ -96,7 +96,7 @@ private:
     TQTextBrowserData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextBrowser( const TQTextBrowser & );
     TQTextBrowser& operator=( const TQTextBrowser & );
 #endif
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h
index b3e28463d..fd3c4e021 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -137,7 +137,7 @@ class Q_EXPORT TQTextEdit : public TQScrollView
     friend class TQTextBrowser;
     friend class TQSyntaxHighlighter;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( WordWrap WrapPolicy )
     Q_SETS( AutoFormatting )
     Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
@@ -458,7 +458,7 @@ protected:
 protected slots:
     virtual void doChangeInterval();
     void sliderReleased(); // ### make virtual in 4.0
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Some functions need to be changed to virtual for TQt 4.0"
 #endif
 
@@ -591,7 +591,7 @@ private:
     bool overWrite : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextEdit( const TQTextEdit & );
     TQTextEdit &operator=( const TQTextEdit & );
 #endif
diff --git a/src/widgets/ntqtextview.h b/src/widgets/ntqtextview.h
index 71c568564..848c692e6 100644
--- a/src/widgets/ntqtextview.h
+++ b/src/widgets/ntqtextview.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQTextView : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool modified SCRIPTABLE false)
@@ -64,7 +64,7 @@ public:
     virtual ~TQTextView();
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextView( const TQTextView & );
     TQTextView &operator=( const TQTextView & );
 #endif
diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/ntqtoolbar.h
index f8237f3af..52e6127af 100644
--- a/src/widgets/ntqtoolbar.h
+++ b/src/widgets/ntqtoolbar.h
@@ -54,7 +54,7 @@ class TQToolBarPrivate;
 
 class Q_EXPORT TQToolBar: public TQDockWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString label READ label WRITE setLabel )
 
 public:
@@ -106,7 +106,7 @@ private:
     friend class TQMainWindow;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolBar( const TQToolBar & );
     TQToolBar& operator=( const TQToolBar & );
 #endif
diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/ntqtoolbox.h
index 07e128e16..9ad92aaa4 100644
--- a/src/widgets/ntqtoolbox.h
+++ b/src/widgets/ntqtoolbox.h
@@ -53,7 +53,7 @@ class TQWidgetList;
 
 class Q_EXPORT TQToolBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex )
     Q_PROPERTY( int count READ count )
 
diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h
index ac2c2df45..e78cf33f6 100644
--- a/src/widgets/ntqtoolbutton.h
+++ b/src/widgets/ntqtoolbutton.h
@@ -56,7 +56,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQToolButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TextPosition )
 
     Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
@@ -149,7 +149,7 @@ protected:
     // ### Make virtual in 4.0, maybe act like TQPushButton with
     // regards to setFlat() instead?  Andy
     bool uses3D() const;
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Some functions need to be changed to virtual for TQt 4.0"
 #endif
 
@@ -181,7 +181,7 @@ private:
     uint hasArrow : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolButton( const TQToolButton & );
     TQToolButton& operator=( const TQToolButton & );
 #endif
diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h
index 55b3817b1..21cb0c397 100644
--- a/src/widgets/ntqtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -55,7 +55,7 @@ class TQListViewToolTip;
 
 class Q_EXPORT TQToolTipGroup: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool delay READ delay WRITE setDelay )
     Q_PROPERTY( bool enabled READ enabled WRITE setEnabled )
 
@@ -81,7 +81,7 @@ private:
     friend class TQTipManager;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolTipGroup( const TQToolTipGroup & );
     TQToolTipGroup& operator=( const TQToolTipGroup & );
 #endif
diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h
index 04902acd4..95696343e 100644
--- a/src/widgets/ntqvalidator.h
+++ b/src/widgets/ntqvalidator.h
@@ -52,7 +52,7 @@
 
 class Q_EXPORT TQValidator : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQValidator( TQObject * parent, const char *name = 0 );
     ~TQValidator();
@@ -63,7 +63,7 @@ public:
     virtual void fixup( TQString & ) const;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQValidator( const TQValidator & );
     TQValidator& operator=( const TQValidator & );
 #endif
@@ -72,7 +72,7 @@ private:
 
 class Q_EXPORT TQIntValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int bottom READ bottom WRITE setBottom )
     Q_PROPERTY( int top READ top WRITE setTop )
 
@@ -92,7 +92,7 @@ public:
     int top() const { return t; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIntValidator( const TQIntValidator & );
     TQIntValidator& operator=( const TQIntValidator & );
 #endif
@@ -104,7 +104,7 @@ private:
 
 class Q_EXPORT TQDoubleValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( double bottom READ bottom WRITE setBottom )
     Q_PROPERTY( double top READ top WRITE setTop )
     Q_PROPERTY( int decimals READ decimals WRITE setDecimals )
@@ -127,7 +127,7 @@ public:
     int decimals() const { return d; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDoubleValidator( const TQDoubleValidator & );
     TQDoubleValidator& operator=( const TQDoubleValidator & );
 #endif
@@ -139,7 +139,7 @@ private:
 
 class Q_EXPORT TQRegExpValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     // Q_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp )
 
 public:
@@ -154,7 +154,7 @@ public:
     const TQRegExp& regExp() const { return r; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRegExpValidator( const TQRegExpValidator& );
     TQRegExpValidator& operator=( const TQRegExpValidator& );
 #endif
diff --git a/src/widgets/ntqvbox.h b/src/widgets/ntqvbox.h
index 740a2811c..f5def6138 100644
--- a/src/widgets/ntqvbox.h
+++ b/src/widgets/ntqvbox.h
@@ -49,12 +49,12 @@
 
 class Q_EXPORT TQVBox : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVBox( TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVBox( const TQVBox & );
     TQVBox& operator=( const TQVBox & );
 #endif
diff --git a/src/widgets/ntqvbuttongroup.h b/src/widgets/ntqvbuttongroup.h
index 41d3c263c..332e555fc 100644
--- a/src/widgets/ntqvbuttongroup.h
+++ b/src/widgets/ntqvbuttongroup.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQVButtonGroup : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVButtonGroup( TQWidget* parent=0, const char* name=0 );
     TQVButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 );
@@ -57,7 +57,7 @@ public:
     ~TQVButtonGroup();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVButtonGroup( const TQVButtonGroup & );
     TQVButtonGroup &operator=( const TQVButtonGroup & );
 #endif
diff --git a/src/widgets/ntqvgroupbox.h b/src/widgets/ntqvgroupbox.h
index f93158af4..afa8ae093 100644
--- a/src/widgets/ntqvgroupbox.h
+++ b/src/widgets/ntqvgroupbox.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQVGroupBox : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVGroupBox( TQWidget* parent=0, const char* name=0 );
     TQVGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 );
@@ -57,7 +57,7 @@ public:
     ~TQVGroupBox();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVGroupBox( const TQVGroupBox & );
     TQVGroupBox &operator=( const TQVGroupBox & );
 #endif
diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/ntqwidgetplugin.h
index d53bdd962..6769ada70 100644
--- a/src/widgets/ntqwidgetplugin.h
+++ b/src/widgets/ntqwidgetplugin.h
@@ -63,7 +63,7 @@ class TQWidget;
 
 class Q_EXPORT TQWidgetPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidgetPlugin();
     ~TQWidgetPlugin();
diff --git a/src/widgets/ntqwidgetstack.h b/src/widgets/ntqwidgetstack.h
index bbb4275fb..1362ca106 100644
--- a/src/widgets/ntqwidgetstack.h
+++ b/src/widgets/ntqwidgetstack.h
@@ -55,7 +55,7 @@ class TQWidgetStackPrivate;
 
 class Q_EXPORT TQWidgetStack: public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidgetStack( TQWidget* parent=0, const char* name=0 );
     TQWidgetStack( TQWidget* parent, const char* name, WFlags f);
@@ -101,7 +101,7 @@ private:
     TQWidget * invisible;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidgetStack( const TQWidgetStack & );
     TQWidgetStack& operator=( const TQWidgetStack & );
 #endif
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 54eb894a1..d911717c1 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -957,7 +957,7 @@ void TQAction::setVisible( bool visible )
 	return;
     d->visible = visible;
     d->update( TQActionPrivate::Visibility );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQAction::setVisible function wants to be virtual. Also add virtual change() function"
 #endif
     if ( d->d_group ) //### this function wants to be virtual in 4.0
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index a34486808..5445f61fb 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -85,7 +85,7 @@ void TQButton::ensureData()
 {
     if ( !d ) {
 	d = new TQButtonData;
-	Q_CHECK_PTR( d );
+	TQ_CHECK_PTR( d );
 	connect(&d->timer, SIGNAL(timeout()), this, SLOT(autoRepeatTimeout()));
     }
 }
@@ -510,7 +510,7 @@ void TQButton::setPixmap( const TQPixmap &pixmap )
     } else {
 	newSize = TRUE;
 	bpixmap = new TQPixmap( pixmap );
-	Q_CHECK_PTR( bpixmap );
+	TQ_CHECK_PTR( bpixmap );
     }
     if ( bpixmap->depth() == 1 && !bpixmap->mask() )
 	bpixmap->setMask( *((TQBitmap *)bpixmap) );
@@ -675,7 +675,7 @@ bool TQButton::hitButton( const TQPoint &pos ) const
 
     \sa drawButtonLabel(), paintEvent()
 */
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQButton. Make pure virtual"
 #endif
 void TQButton::drawButton( TQPainter * )
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index 17bcd200b..f90223225 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -196,7 +196,7 @@ TQButtonGroup::TQButtonGroup( int strips, Orientation orientation,
 void TQButtonGroup::init()
 {
     buttons = new TQButtonList;
-    Q_CHECK_PTR( buttons );
+    TQ_CHECK_PTR( buttons );
     buttons->setAutoDelete( TRUE );
     excl_grp = FALSE;
     radio_excl = TRUE;
@@ -255,7 +255,7 @@ int TQButtonGroup::insert( TQButton *button, int id )
 
     static int seq_no = -2;
     TQButtonItem *bi = new TQButtonItem;
-    Q_CHECK_PTR( bi );
+    TQ_CHECK_PTR( bi );
 
     if ( id < -1 )
 	bi->id = seq_no--;
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index b4982a167..a4b78c136 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -225,7 +225,7 @@ void TQCheckBox::drawButton( TQPainter *paint )
     int wx = 0, wy = 0;
     if ( use_pm ) {
 	pm = new TQPixmap( irect.size() );	// create new pixmap
-	Q_CHECK_PTR( pm );
+	TQ_CHECK_PTR( pm );
 	pm->fill( cg.background() );
 	TQPainter::redirect(this, pm);
 	pmpaint.begin(this);
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index 6a8d274c6..c7fa1d5a6 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -380,7 +380,7 @@ private:
 
 class TQDateTimeEditor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDateTimeEditor( TQDateTimeEditBase * widget, TQWidget *parent,
 		       const char * name=0 );
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h
index f6ecb3784..0e7c20d6b 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/qdialogbuttons_p.h
@@ -51,7 +51,7 @@ struct TQDialogButtonsPrivate;
 class
 TQDialogButtons : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Button { None=0, Accept=0x01, Reject=0x02, Help=0x04, Apply=0x08, All=0x10, Abort=0x20, Retry=0x40, Ignore=0x80 };
 #ifndef QT_NO_DIALOG
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 867d64a7b..875f6d610 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -72,7 +72,7 @@ class TQDockWindowPrivate
 
 class TQDockWindowResizeHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDockWindowResizeHandle( TQt::Orientation o, TQWidget *parent, TQDockWindow *w, const char* /*name*/=0 );
@@ -307,7 +307,7 @@ static TQPoint realWidgetPos( TQDockWindow *w )
 
 class TQDockWindowHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString caption READ caption )
     friend class TQDockWindow;
     friend class TQDockWindowTitleBar;
@@ -357,7 +357,7 @@ private:
 
 class TQDockWindowTitleBar : public TQTitleBar
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQDockWindow;
     friend class TQDockWindowHandle;
 
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index 0e5cf7846..98939b4c2 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -71,7 +71,7 @@ public:
 
 class TQAlphaWidget: public TQWidget, private TQEffects
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQAlphaWidget( TQWidget* w, WFlags f = 0 );
 
@@ -338,7 +338,7 @@ void TQAlphaWidget::alphaBlend()
 
 class TQRollEffect : public TQWidget, private TQEffects
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQRollEffect( TQWidget* w, WFlags f, DirFlags orient );
 
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 18d87f624..173548c38 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -7779,7 +7779,7 @@ void TQListViewItemIterator::addToListView()
     if ( listView ) {
 	if ( !listView->d->iterators ) {
 	    listView->d->iterators = new TQPtrList<TQListViewItemIterator>;
-	    Q_CHECK_PTR( listView->d->iterators );
+	    TQ_CHECK_PTR( listView->d->iterators );
 	}
 	listView->d->iterators->append( this );
     }
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 26a96dbeb..72491a25d 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -128,7 +128,7 @@ public:
 
 class TQMainWindowLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQMainWindowLayout( TQMainWindow *mw, TQLayout* parent = 0 );
@@ -299,7 +299,7 @@ public:
 
 class TQHideDock : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQHideDock( TQMainWindow *parent ) : TQWidget( parent, "qt_hide_dock" ) {
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index 96a111b49..d1fde81c2 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -908,7 +908,7 @@ int TQMenuBar::calculateRects( int max_width )
 	    irects = 0;
 	} else {
 	    irects = new TQRect[ i ];
-	    Q_CHECK_PTR( irects );
+	    TQ_CHECK_PTR( irects );
 	}
 	max_width = width();
     }
@@ -1545,7 +1545,7 @@ void TQMenuBar::setupAccelerators()
 	    if ( i ) {
 		if ( !autoaccel ) {
 		    autoaccel = new TQAccel( this );
-		    Q_CHECK_PTR( autoaccel );
+		    TQ_CHECK_PTR( autoaccel );
 		    autoaccel->setIgnoreWhatsThis( TRUE );
 		    connect( autoaccel, SIGNAL(activated(int)),
 			     SLOT(accelActivated(int)) );
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp
index 4bacd22f8..e40aa0b73 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/qmenudata.cpp
@@ -158,7 +158,7 @@ TQMenuData::TQMenuData()
 {
     actItem = -1;				// no active menu item
     mitems = new TQMenuItemList;			// create list of menu items
-    Q_CHECK_PTR( mitems );
+    TQ_CHECK_PTR( mitems );
     mitems->setAutoDelete( TRUE );
     parentMenu = 0;				// assume top level
     isPopupMenu = FALSE;
@@ -261,7 +261,7 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap,
 	id = get_seq_id();
 
     register TQMenuItem *mi = new TQMenuItem;
-    Q_CHECK_PTR( mi );
+    TQ_CHECK_PTR( mi );
     mi->ident = id;
     if ( widget != 0 ) {
 	mi->widget_item = widget;
@@ -1361,7 +1361,7 @@ bool TQMenuData::setItemParameter( int id, int param ) {
 	return FALSE;
     if ( !mi->signal_data ) {			// create new signal
 	mi->signal_data = new TQSignal;
-	Q_CHECK_PTR( mi->signal_data );
+	TQ_CHECK_PTR( mi->signal_data );
     }
     mi->signal_data->setValue( param );
     return TRUE;
@@ -1403,7 +1403,7 @@ bool TQMenuData::connectItem( int id, const TQObject *receiver,
 	return FALSE;
     if ( !mi->signal_data ) {			// create new signal
 	mi->signal_data = new TQSignal;
-	Q_CHECK_PTR( mi->signal_data );
+	TQ_CHECK_PTR( mi->signal_data );
 	mi->signal_data->setValue( id );
     }
     return mi->signal_data->connect( receiver, member );
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 9c03b0319..ed9aa45c8 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -502,7 +502,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
 	return;
 #endif
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "Fix this now"
     // #### should move to TQWidget - anything might need this functionality,
     // #### since anything can have WType_Popup window flag.
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index e4c343f90..2d0515137 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -230,7 +230,7 @@ void TQRadioButton::drawButton( TQPainter *paint )
     int wx, wy;
     if ( use_pm ) {
 	pm = new TQPixmap( irect.size() );	// create new pixmap
-	Q_CHECK_PTR( pm );
+	TQ_CHECK_PTR( pm );
 	pm->fill(paletteBackgroundColor());
 	TQPainter::redirect(this, pm);
 	pmpaint.begin(this);
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index 484e67da4..68dcd700b 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -101,7 +101,7 @@ void TQSVChildRec::hideOrShow(TQScrollView* sv, TQWidget* clipped_viewport)
 
 class TQViewportWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQViewportWidget( TQScrollView* parent=0, const char* name=0, WFlags f = 0 )
@@ -110,7 +110,7 @@ public:
 
 class TQClipperWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQClipperWidget( TQWidget * parent=0, const char * name=0, WFlags f=0 )
@@ -2097,7 +2097,7 @@ void TQScrollView::moveContents(int x, int y)
     d->hideOrShowAll(this, TRUE );
 }
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
 #warning "Should rename contents{X,Y,Width,Height} to viewport{...}"
 #endif
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp
index c4419cee2..754d39ff5 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/qspinbox.cpp
@@ -195,7 +195,7 @@ TQValidator::State TQSpinBoxValidator::validate( TQString& str, int& pos ) const
     \code
 	class MySpinBox : public TQSpinBox
 	{
-	    Q_OBJECT
+	    TQ_OBJECT
 	public:
 	    ...
 
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index 9da69d02e..b255aaabe 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -338,7 +338,7 @@ void TQTabWidget::addTab( TQWidget *child, TQTab* tab )
 void TQTabWidget::insertTab( TQWidget *child, const TQString &label, int index)
 {
     TQTab * t = new TQTab();
-    Q_CHECK_PTR( t );
+    TQ_CHECK_PTR( t );
     t->label = label;
     insertTab( child, t, index );
 }
@@ -355,7 +355,7 @@ void TQTabWidget::insertTab( TQWidget *child, const TQString &label, int index)
 void TQTabWidget::insertTab( TQWidget *child, const TQIconSet& iconset, const TQString &label, int index )
 {
     TQTab * t = new TQTab();
-    Q_CHECK_PTR( t );
+    TQ_CHECK_PTR( t );
     t->label = label;
     t->iconset = new TQIconSet( iconset );
     insertTab( child, t, index );
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index 561903ab1..cb6da79c3 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -5014,7 +5014,7 @@ void TQTextEdit::scrollToAnchor( const TQString& name )
     }
 }
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "function anchorAt(const TQPoint& pos) should be merged into function anchorAt(const TQPoint& pos, AnchorAttribute attr)"
 #endif
 
@@ -6156,7 +6156,7 @@ bool TQTextEdit::tabChangesFocus() const
 #ifdef QT_TEXTEDIT_OPTIMIZATION
 /* Implementation of optimized LogText mode follows */
 
-static void qSwap( int * a, int * b )
+static void tqSwap( int * a, int * b )
 {
     if ( !a || !b )
 	return;
@@ -6975,8 +6975,8 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy,
 	int selEnd = d->od->selEnd.line;
 	int idxEnd = d->od->selEnd.index;
 	if ( selEnd < selStart ) {
-	    qSwap( &selStart, &selEnd );
-	    qSwap( &idxStart, &idxEnd );
+	    tqSwap( &selStart, &selEnd );
+	    tqSwap( &idxStart, &idxEnd );
 	}
 	if ( selEnd > d->od->numLines-1 ) {
 	    selEnd = d->od->numLines-1;
@@ -7085,11 +7085,11 @@ void TQTextEdit::optimMouseReleaseEvent( TQMouseEvent * e )
 	mousePos = e->pos();
 	d->od->selEnd.index = optimCharIndex( str, mousePos.x() );
 	if ( d->od->selEnd.line < d->od->selStart.line ) {
-	    qSwap( &d->od->selStart.line, &d->od->selEnd.line );
-	    qSwap( &d->od->selStart.index, &d->od->selEnd.index );
+	    tqSwap( &d->od->selStart.line, &d->od->selEnd.line );
+	    tqSwap( &d->od->selStart.index, &d->od->selEnd.index );
 	} else if ( d->od->selStart.line == d->od->selEnd.line &&
 		    d->od->selStart.index > d->od->selEnd.index ) {
-	    qSwap( &d->od->selStart.index, &d->od->selEnd.index );
+	    tqSwap( &d->od->selStart.index, &d->od->selEnd.index );
 	}
 	oldMousePos = e->pos();
 	repaintContents( FALSE );
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index e50315804..bf6e9e819 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -68,7 +68,7 @@ class TQPixmap;
 
 class Q_EXPORT TQTitleBar : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise )
     Q_PROPERTY( bool movable READ isMovable WRITE setMovable )
 
@@ -129,7 +129,7 @@ private:
     void readColors();
 
     TQTitleBarPrivate *d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTitleBar( const TQTitleBar & );
     TQTitleBar &operator=( const TQTitleBar & );
 #endif
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index 024ad323d..2a48bf628 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -100,7 +100,7 @@ public:
 
 class TQToolBarSeparator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 );
 
@@ -118,7 +118,7 @@ private:
 
 class TQToolBarExtensionWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQToolBarExtensionWidget( TQWidget *w );
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index ace4fd317..5507bfc79 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -61,7 +61,7 @@ static inline TQRect entireWidget()
 
 class TQTipLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTipLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip",
 	     WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM )
@@ -84,7 +84,7 @@ public:
 
 class TQTipManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTipManager();
    ~TQTipManager();
@@ -150,7 +150,7 @@ static void initTipManager()
 {
     if ( !tipManager ) {
 	tipManager = new TQTipManager;
-	Q_CHECK_PTR( tipManager );
+	TQ_CHECK_PTR( tipManager );
     }
 }
 
@@ -523,7 +523,7 @@ void TQTipManager::showTip()
 	label = new TQTipLabel( TQApplication::desktop()->screen( scr ), t->text);
 	if ( t->geometry != TQRect( -1, -1, -1, -1 ) )
 	    label->resize( t->geometry.size() );
-	Q_CHECK_PTR( label );
+	TQ_CHECK_PTR( label );
 	connect( label, SIGNAL(destroyed()), SLOT(labelDestroyed()) );
     }
     // the above deletion and creation of a TQTipLabel causes events to be sent. We had reports that the widget
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 55d653e92..f1c4fe6a5 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -131,7 +131,7 @@
 // a special button
 class TQWhatsThisButton: public TQToolButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQWhatsThisButton( TQWidget * parent, const char * name );
@@ -145,7 +145,7 @@ public slots:
 
 class TQWhatsThat : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, const char* name );
     ~TQWhatsThat() ;
@@ -174,7 +174,7 @@ private:
 
 class TQWhatsThisPrivate: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     // an item for storing texts
diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h
index 395e3d1eb..c86ada5dd 100644
--- a/src/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/qwidgetresizehandler_p.h
@@ -62,7 +62,7 @@ class TQKeyEvent;
 
 class Q_EXPORT TQWidgetResizeHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum Action {
@@ -126,7 +126,7 @@ private:
     }
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidgetResizeHandler( const TQWidgetResizeHandler & );
     TQWidgetResizeHandler& operator=( const TQWidgetResizeHandler & );
 #endif
diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp
index 9b80a2fdb..d6adf42d7 100644
--- a/src/widgets/qwidgetstack.cpp
+++ b/src/widgets/qwidgetstack.cpp
@@ -67,7 +67,7 @@ public:
 };
 
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
 #warning "Remove TQWidgetStackEventFilter"
 #endif