Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

43 files changed, 320 insertions, 320 deletions

diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h
index 919ba22ef..48f72f0fb 100644
--- a/src/widgets/ntqaction.h
+++ b/src/widgets/ntqaction.h
@@ -59,19 +59,19 @@ class TQToolTipGroup;
 class Q_EXPORT TQAction : public TQObject
 {
     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 )
-    Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( TQString menuText READ menuText WRITE setMenuText )
-    Q_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip )
-    Q_PROPERTY( TQString statusTip READ statusTip WRITE setStatusTip )
-    Q_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis )
+    TQ_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction)
+    TQ_PROPERTY( bool on READ isOn WRITE setOn )
+    TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
+    TQ_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( TQString menuText READ menuText WRITE setMenuText )
+    TQ_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip )
+    TQ_PROPERTY( TQString statusTip READ statusTip WRITE setStatusTip )
+    TQ_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis )
 #ifndef QT_NO_ACCEL
-    Q_PROPERTY( TQKeySequence accel READ accel WRITE setAccel )
+    TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel )
 #endif
-    Q_PROPERTY( bool visible READ isVisible WRITE setVisible )
+    TQ_PROPERTY( bool visible READ isVisible WRITE setVisible )
 
 public:
     TQAction( TQObject* parent, const char* name = 0 );
@@ -154,8 +154,8 @@ private:
 class Q_EXPORT TQActionGroup : public TQAction
 {
     TQ_OBJECT
-    Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
-    Q_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown )
+    TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
+    TQ_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown )
 
 public:
     TQActionGroup( TQObject* parent, const char* name = 0 );
diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h
index ce5f85e4d..b59ac0909 100644
--- a/src/widgets/ntqbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -56,18 +56,18 @@ class TQButtonData;
 class Q_EXPORT TQButton : public TQWidget
 {
     TQ_OBJECT
-    Q_ENUMS( ToggleType ToggleState )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
-    Q_PROPERTY( TQKeySequence accel READ accel WRITE setAccel )
-    Q_PROPERTY( bool toggleButton READ isToggleButton )
-    Q_PROPERTY( ToggleType toggleType READ toggleType )
-    Q_PROPERTY( bool down READ isDown WRITE setDown DESIGNABLE false  )
-    Q_PROPERTY( bool on READ isOn )
-    Q_PROPERTY( ToggleState toggleState READ state )
-    Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
-    Q_PROPERTY( bool autoRepeat READ autoRepeat WRITE setAutoRepeat )
-    Q_PROPERTY( bool exclusiveToggle READ isExclusiveToggle )
+    TQ_ENUMS( ToggleType ToggleState )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+    TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel )
+    TQ_PROPERTY( bool toggleButton READ isToggleButton )
+    TQ_PROPERTY( ToggleType toggleType READ toggleType )
+    TQ_PROPERTY( bool down READ isDown WRITE setDown DESIGNABLE false  )
+    TQ_PROPERTY( bool on READ isOn )
+    TQ_PROPERTY( ToggleState toggleState READ state )
+    TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
+    TQ_PROPERTY( bool autoRepeat READ autoRepeat WRITE setAutoRepeat )
+    TQ_PROPERTY( bool exclusiveToggle READ isExclusiveToggle )
 
 public:
     TQButton( TQWidget* parent=0, const char* name=0, WFlags f=0 );
diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/ntqbuttongroup.h
index 466e578f0..92e2860af 100644
--- a/src/widgets/ntqbuttongroup.h
+++ b/src/widgets/ntqbuttongroup.h
@@ -55,9 +55,9 @@ class TQButtonList;
 class Q_EXPORT TQButtonGroup : public TQGroupBox
 {
     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 )
+    TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
+    TQ_PROPERTY( bool radioButtonExclusive READ isRadioButtonExclusive WRITE setRadioButtonExclusive )
+    TQ_PROPERTY( int selectedId READ selectedId WRITE setButton )
 
 public:
     TQButtonGroup( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/ntqcheckbox.h
index e51107769..a62a0d1bb 100644
--- a/src/widgets/ntqcheckbox.h
+++ b/src/widgets/ntqcheckbox.h
@@ -50,9 +50,9 @@
 class Q_EXPORT TQCheckBox : public TQButton
 {
     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 )
+    TQ_PROPERTY( bool checked READ isChecked WRITE setChecked )
+    TQ_PROPERTY( bool tristate READ isTristate WRITE setTristate )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
     TQCheckBox( TQWidget *parent, const char* name=0 );
diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h
index 9ab4e3a35..c6b27ce93 100644
--- a/src/widgets/ntqcombobox.h
+++ b/src/widgets/ntqcombobox.h
@@ -59,18 +59,18 @@ class TQWheelEvent;
 class Q_EXPORT TQComboBox : public TQWidget
 {
     TQ_OBJECT
-    Q_ENUMS( Policy )
-    Q_PROPERTY( bool editable READ editable WRITE setEditable )
-    Q_PROPERTY( int count READ count )
-    Q_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
-    Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
-    Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
-    Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
-    Q_PROPERTY( int maxCount READ maxCount WRITE setMaxCount )
-    Q_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy )
-    Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
-    Q_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled )
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_ENUMS( Policy )
+    TQ_PROPERTY( bool editable READ editable WRITE setEditable )
+    TQ_PROPERTY( int count READ count )
+    TQ_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false )
+    TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
+    TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
+    TQ_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
+    TQ_PROPERTY( int maxCount READ maxCount WRITE setMaxCount )
+    TQ_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy )
+    TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
+    TQ_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
     TQComboBox( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h
index e53273f28..8078d826d 100644
--- a/src/widgets/ntqdatetimeedit.h
+++ b/src/widgets/ntqdatetimeedit.h
@@ -77,12 +77,12 @@ class TQDateEditPrivate;
 class Q_EXPORT TQDateEdit : public TQDateTimeEditBase
 {
     TQ_OBJECT
-    Q_ENUMS( Order )
-    Q_PROPERTY( Order order READ order WRITE setOrder )
-    Q_PROPERTY( TQDate date READ date WRITE setDate )
-    Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance )
-    Q_PROPERTY( TQDate maxValue READ maxValue WRITE setMaxValue )
-    Q_PROPERTY( TQDate minValue READ minValue WRITE setMinValue )
+    TQ_ENUMS( Order )
+    TQ_PROPERTY( Order order READ order WRITE setOrder )
+    TQ_PROPERTY( TQDate date READ date WRITE setDate )
+    TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance )
+    TQ_PROPERTY( TQDate maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( TQDate minValue READ minValue WRITE setMinValue )
 
 public:
     TQDateEdit( TQWidget* parent=0,  const char* name=0 );
@@ -157,12 +157,12 @@ class TQTimeEditPrivate;
 class Q_EXPORT TQTimeEdit : public TQDateTimeEditBase
 {
     TQ_OBJECT
-    Q_SETS( Display )
-    Q_PROPERTY( TQTime time READ time WRITE setTime )
-    Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance )
-    Q_PROPERTY( TQTime maxValue READ maxValue WRITE setMaxValue )
-    Q_PROPERTY( TQTime minValue READ minValue WRITE setMinValue )
-    Q_PROPERTY( Display display READ display WRITE setDisplay )
+    TQ_SETS( Display )
+    TQ_PROPERTY( TQTime time READ time WRITE setTime )
+    TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance )
+    TQ_PROPERTY( TQTime maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( TQTime minValue READ minValue WRITE setMinValue )
+    TQ_PROPERTY( Display display READ display WRITE setDisplay )
 
 public:
     enum Display {
@@ -241,7 +241,7 @@ class TQDateTimeEditPrivate;
 class Q_EXPORT TQDateTimeEdit : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
+    TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
 
 public:
     TQDateTimeEdit( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h
index 2fd25d94e..c28bedfa0 100644
--- a/src/widgets/ntqdial.h
+++ b/src/widgets/ntqdial.h
@@ -54,16 +54,16 @@ class TQDialPrivate;
 class Q_EXPORT TQDial: public TQWidget, public TQRangeControl
 {
     TQ_OBJECT
-    Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
-    Q_PROPERTY( bool wrapping READ wrapping WRITE setWrapping )
-    Q_PROPERTY( int notchSize READ notchSize )
-    Q_PROPERTY( double notchTarget READ notchTarget WRITE setNotchTarget )
-    Q_PROPERTY( bool notchesVisible READ notchesVisible WRITE setNotchesVisible )
-    Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
-    Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
-    Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
-    Q_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
-    Q_PROPERTY( int value READ value WRITE setValue )
+    TQ_PROPERTY( bool tracking READ tracking WRITE setTracking )
+    TQ_PROPERTY( bool wrapping READ wrapping WRITE setWrapping )
+    TQ_PROPERTY( int notchSize READ notchSize )
+    TQ_PROPERTY( double notchTarget READ notchTarget WRITE setNotchTarget )
+    TQ_PROPERTY( bool notchesVisible READ notchesVisible WRITE setNotchesVisible )
+    TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+    TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
+    TQ_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
+    TQ_PROPERTY( int value READ value WRITE setValue )
 	
 public:
     TQDial( TQWidget* parent=0, const char* name=0, WFlags f = 0 );
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index 7ce03c1c3..7a5a5910b 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -106,11 +106,11 @@ private:
 class Q_EXPORT TQDockArea : public TQWidget
 {
     TQ_OBJECT
-    Q_ENUMS( HandlePosition )
-    Q_PROPERTY( Orientation orientation READ orientation )
-    Q_PROPERTY( int count READ count )
-    Q_PROPERTY( bool empty READ isEmpty )
-    Q_PROPERTY( HandlePosition handlePosition READ handlePosition )
+    TQ_ENUMS( HandlePosition )
+    TQ_PROPERTY( Orientation orientation READ orientation )
+    TQ_PROPERTY( int count READ count )
+    TQ_PROPERTY( bool empty READ isEmpty )
+    TQ_PROPERTY( HandlePosition handlePosition READ handlePosition )
 
     friend class TQDockWindow;
     friend class TQDockWindowResizeHandle;
diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h
index 96e417b94..fa9d66bc3 100644
--- a/src/widgets/ntqdockwindow.h
+++ b/src/widgets/ntqdockwindow.h
@@ -65,17 +65,17 @@ class TQWindowsXPStyle;
 class Q_EXPORT TQDockWindow : public TQFrame
 {
     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 )
-    Q_PROPERTY( bool movingEnabled READ isMovingEnabled  WRITE setMovingEnabled )
-    Q_PROPERTY( bool horizontallyStretchable READ isHorizontallyStretchable  WRITE setHorizontallyStretchable )
-    Q_PROPERTY( bool verticallyStretchable READ isVerticallyStretchable  WRITE setVerticallyStretchable )
-    Q_PROPERTY( bool stretchable READ isStretchable )
-    Q_PROPERTY( bool newLine READ newLine  WRITE setNewLine )
-    Q_PROPERTY( bool opaqueMoving READ opaqueMoving  WRITE setOpaqueMoving )
-    Q_PROPERTY( int offset READ offset  WRITE setOffset )
-    Q_PROPERTY( Place place READ place )
+    TQ_ENUMS( CloseMode Place )
+    TQ_PROPERTY( int closeMode READ closeMode  WRITE setCloseMode ) //### this shouldn't be of type int?!
+    TQ_PROPERTY( bool resizeEnabled READ isResizeEnabled  WRITE setResizeEnabled )
+    TQ_PROPERTY( bool movingEnabled READ isMovingEnabled  WRITE setMovingEnabled )
+    TQ_PROPERTY( bool horizontallyStretchable READ isHorizontallyStretchable  WRITE setHorizontallyStretchable )
+    TQ_PROPERTY( bool verticallyStretchable READ isVerticallyStretchable  WRITE setVerticallyStretchable )
+    TQ_PROPERTY( bool stretchable READ isStretchable )
+    TQ_PROPERTY( bool newLine READ newLine  WRITE setNewLine )
+    TQ_PROPERTY( bool opaqueMoving READ opaqueMoving  WRITE setOpaqueMoving )
+    TQ_PROPERTY( int offset READ offset  WRITE setOffset )
+    TQ_PROPERTY( Place place READ place )
 
     friend class TQDockWindowHandle;
     friend class TQDockWindowTitleBar;
diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h
index 21a1cbe45..8c66f0b17 100644
--- a/src/widgets/ntqframe.h
+++ b/src/widgets/ntqframe.h
@@ -50,15 +50,15 @@
 class Q_EXPORT TQFrame : public TQWidget
 {
     TQ_OBJECT
-    Q_ENUMS( Shape Shadow )
-    Q_PROPERTY( int frameWidth READ frameWidth )
-    Q_PROPERTY( TQRect contentsRect READ contentsRect )
-    Q_PROPERTY( Shape frameShape READ frameShape WRITE setFrameShape )
-    Q_PROPERTY( Shadow frameShadow READ frameShadow WRITE setFrameShadow )
-    Q_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth )
-    Q_PROPERTY( int margin READ margin WRITE setMargin )
-    Q_PROPERTY( int midLineWidth READ midLineWidth WRITE setMidLineWidth )
-    Q_PROPERTY( TQRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false )
+    TQ_ENUMS( Shape Shadow )
+    TQ_PROPERTY( int frameWidth READ frameWidth )
+    TQ_PROPERTY( TQRect contentsRect READ contentsRect )
+    TQ_PROPERTY( Shape frameShape READ frameShape WRITE setFrameShape )
+    TQ_PROPERTY( Shadow frameShadow READ frameShadow WRITE setFrameShadow )
+    TQ_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth )
+    TQ_PROPERTY( int margin READ margin WRITE setMargin )
+    TQ_PROPERTY( int midLineWidth READ midLineWidth WRITE setMidLineWidth )
+    TQ_PROPERTY( TQRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false )
 
 public:
     TQFrame( TQWidget* parent=0, const char* name=0, WFlags f=0 );
diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h
index e15816894..72b0982f2 100644
--- a/src/widgets/ntqgridview.h
+++ b/src/widgets/ntqgridview.h
@@ -52,10 +52,10 @@ class TQGridViewPrivate;
 class Q_EXPORT TQGridView : public TQScrollView
 {
     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 )
-    Q_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight )
+    TQ_PROPERTY( int numRows READ numRows WRITE setNumRows )
+    TQ_PROPERTY( int numCols READ numCols WRITE setNumCols )
+    TQ_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
+    TQ_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight )
 public:
 
     TQGridView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h
index bd4ef3548..49b7aa722 100644
--- a/src/widgets/ntqgroupbox.h
+++ b/src/widgets/ntqgroupbox.h
@@ -57,14 +57,14 @@ class TQSpacerItem;
 class Q_EXPORT TQGroupBox : public TQFrame
 {
     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 )
-    Q_PROPERTY( int columns READ columns WRITE setColumns DESIGNABLE false )
-    Q_PROPERTY( bool flat READ isFlat WRITE setFlat )
+    TQ_PROPERTY( TQString title READ title WRITE setTitle )
+    TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false )
+    TQ_PROPERTY( int columns READ columns WRITE setColumns DESIGNABLE false )
+    TQ_PROPERTY( bool flat READ isFlat WRITE setFlat )
 #ifndef QT_NO_CHECKBOX
-    Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
-    Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
+    TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
+    TQ_PROPERTY( bool checked READ isChecked WRITE setChecked )
 #endif
 public:
     TQGroupBox( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h
index b079e3af9..a6d9ce339 100644
--- a/src/widgets/ntqheader.h
+++ b/src/widgets/ntqheader.h
@@ -60,12 +60,12 @@ class Q_EXPORT TQHeader : public TQWidget
     friend class TQListView;
 
     TQ_OBJECT
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
-    Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
-    Q_PROPERTY( int count READ count )
-    Q_PROPERTY( int offset READ offset WRITE setOffset )
-    Q_PROPERTY( bool moving READ isMovingEnabled WRITE setMovingEnabled )
-    Q_PROPERTY( bool stretching READ isStretchEnabled WRITE setStretchEnabled )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_PROPERTY( bool tracking READ tracking WRITE setTracking )
+    TQ_PROPERTY( int count READ count )
+    TQ_PROPERTY( int offset READ offset WRITE setOffset )
+    TQ_PROPERTY( bool moving READ isMovingEnabled WRITE setMovingEnabled )
+    TQ_PROPERTY( bool stretching READ isStretchEnabled WRITE setStretchEnabled )
 
 public:
     TQHeader( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h
index 5e978931f..b1d439fcd 100644
--- a/src/widgets/ntqlabel.h
+++ b/src/widgets/ntqlabel.h
@@ -53,13 +53,13 @@ class TQLabelPrivate;
 class Q_EXPORT TQLabel : public TQFrame
 {
     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 )
-    Q_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents )
-    Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
-    Q_PROPERTY( int indent READ indent WRITE setIndent )
-    Q_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true)
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+    TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents )
+    TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
+    TQ_PROPERTY( int indent READ indent WRITE setIndent )
+    TQ_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true)
 
 public:
     TQLabel( TQWidget *parent, const char* name=0, WFlags f=0 );
diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h
index 01d216ce2..f76aa224c 100644
--- a/src/widgets/ntqlcdnumber.h
+++ b/src/widgets/ntqlcdnumber.h
@@ -54,13 +54,13 @@ class TQLCDNumberPrivate;
 class Q_EXPORT TQLCDNumber : public TQFrame		// LCD number widget
 {
     TQ_OBJECT
-    Q_ENUMS( Mode SegmentStyle )
-    Q_PROPERTY( bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint )
-    Q_PROPERTY( int numDigits READ numDigits WRITE setNumDigits )
-    Q_PROPERTY( Mode mode READ mode WRITE setMode )
-    Q_PROPERTY( SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle )
-    Q_PROPERTY( double value READ value WRITE display )
-    Q_PROPERTY( int intValue READ intValue WRITE display )
+    TQ_ENUMS( Mode SegmentStyle )
+    TQ_PROPERTY( bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint )
+    TQ_PROPERTY( int numDigits READ numDigits WRITE setNumDigits )
+    TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+    TQ_PROPERTY( SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle )
+    TQ_PROPERTY( double value READ value WRITE display )
+    TQ_PROPERTY( int intValue READ intValue WRITE display )
 
 public:
     TQLCDNumber( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h
index 8067cfbaf..9a2305608 100644
--- a/src/widgets/ntqlineedit.h
+++ b/src/widgets/ntqlineedit.h
@@ -59,26 +59,26 @@ class TQTextCursor;
 class Q_EXPORT TQLineEdit : public TQFrame
 {
     TQ_OBJECT
-    Q_ENUMS( EchoMode )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( int maxLength READ maxLength WRITE setMaxLength )
-    Q_PROPERTY( bool frame READ frame WRITE setFrame )
-    Q_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode )
-    Q_PROPERTY( TQString displayText READ displayText )
-    Q_PROPERTY( int cursorPosition READ cursorPosition WRITE setCursorPosition )
-    Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
-    Q_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false )
-    Q_PROPERTY( bool modified READ isModified )
-    Q_PROPERTY( bool hasMarkedText READ hasMarkedText DESIGNABLE false )
-    Q_PROPERTY( bool hasSelectedText READ hasSelectedText )
-    Q_PROPERTY( TQString markedText READ markedText DESIGNABLE false )
-    Q_PROPERTY( TQString selectedText READ selectedText )
-    Q_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled )
-    Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
-    Q_PROPERTY( bool undoAvailable READ isUndoAvailable )
-    Q_PROPERTY( bool redoAvailable READ isRedoAvailable )
-    Q_PROPERTY( TQString inputMask READ inputMask WRITE setInputMask )
-    Q_PROPERTY( bool acceptableInput READ hasAcceptableInput )
+    TQ_ENUMS( EchoMode )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( int maxLength READ maxLength WRITE setMaxLength )
+    TQ_PROPERTY( bool frame READ frame WRITE setFrame )
+    TQ_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode )
+    TQ_PROPERTY( TQString displayText READ displayText )
+    TQ_PROPERTY( int cursorPosition READ cursorPosition WRITE setCursorPosition )
+    TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
+    TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false )
+    TQ_PROPERTY( bool modified READ isModified )
+    TQ_PROPERTY( bool hasMarkedText READ hasMarkedText DESIGNABLE false )
+    TQ_PROPERTY( bool hasSelectedText READ hasSelectedText )
+    TQ_PROPERTY( TQString markedText READ markedText DESIGNABLE false )
+    TQ_PROPERTY( TQString selectedText READ selectedText )
+    TQ_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled )
+    TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
+    TQ_PROPERTY( bool undoAvailable READ isUndoAvailable )
+    TQ_PROPERTY( bool redoAvailable READ isRedoAvailable )
+    TQ_PROPERTY( TQString inputMask READ inputMask WRITE setInputMask )
+    TQ_PROPERTY( bool acceptableInput READ hasAcceptableInput )
 
 public:
     TQLineEdit( TQWidget* parent, const char* name=0 );
diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h
index 91cece44e..c9790959f 100644
--- a/src/widgets/ntqlistbox.h
+++ b/src/widgets/ntqlistbox.h
@@ -62,20 +62,20 @@ class Q_EXPORT TQListBox : public TQScrollView
     friend class TQListBoxPrivate;
 
     TQ_OBJECT
-    Q_ENUMS( SelectionMode LayoutMode )
-    Q_PROPERTY( uint count READ count )
-    Q_PROPERTY( int numItemsVisible READ numItemsVisible )
-    Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
-    Q_PROPERTY( TQString currentText READ currentText )
-    Q_PROPERTY( int topItem READ topItem WRITE setTopItem DESIGNABLE false )
-    Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
-    Q_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false )
-    Q_PROPERTY( LayoutMode columnMode READ columnMode WRITE setColumnMode )
-    Q_PROPERTY( LayoutMode rowMode READ rowMode WRITE setRowMode )
-    Q_PROPERTY( int numColumns READ numColumns )
-    Q_PROPERTY( int numRows READ numRows )
-    Q_PROPERTY( bool variableWidth READ variableWidth WRITE setVariableWidth )
-    Q_PROPERTY( bool variableHeight READ variableHeight WRITE setVariableHeight )
+    TQ_ENUMS( SelectionMode LayoutMode )
+    TQ_PROPERTY( uint count READ count )
+    TQ_PROPERTY( int numItemsVisible READ numItemsVisible )
+    TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
+    TQ_PROPERTY( TQString currentText READ currentText )
+    TQ_PROPERTY( int topItem READ topItem WRITE setTopItem DESIGNABLE false )
+    TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
+    TQ_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false )
+    TQ_PROPERTY( LayoutMode columnMode READ columnMode WRITE setColumnMode )
+    TQ_PROPERTY( LayoutMode rowMode READ rowMode WRITE setRowMode )
+    TQ_PROPERTY( int numColumns READ numColumns )
+    TQ_PROPERTY( int numRows READ numRows )
+    TQ_PROPERTY( bool variableWidth READ variableWidth WRITE setVariableWidth )
+    TQ_PROPERTY( bool variableHeight READ variableHeight WRITE setVariableHeight )
 
 public:
     TQListBox( TQWidget* parent=0, const char* name=0, WFlags f=0  );
diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h
index e647152a3..5c976bd8a 100644
--- a/src/widgets/ntqlistview.h
+++ b/src/widgets/ntqlistview.h
@@ -241,19 +241,19 @@ class Q_EXPORT TQListView: public TQScrollView
     friend class TQListViewToolTip;
 
     TQ_OBJECT
-    Q_ENUMS( SelectionMode ResizeMode RenameAction )
-    Q_PROPERTY( int columns READ columns )
-    Q_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false )
-    Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
-    Q_PROPERTY( int childCount READ childCount )
-    Q_PROPERTY( bool allColumnsShowFocus READ allColumnsShowFocus WRITE setAllColumnsShowFocus )
-    Q_PROPERTY( bool showSortIndicator READ showSortIndicator WRITE setShowSortIndicator )
-    Q_PROPERTY( int itemMargin READ itemMargin WRITE setItemMargin )
-    Q_PROPERTY( bool rootIsDecorated READ rootIsDecorated WRITE setRootIsDecorated )
-    Q_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips )
-    Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
-    Q_PROPERTY( int treeStepSize READ treeStepSize WRITE setTreeStepSize )
-    Q_PROPERTY( RenameAction defaultRenameAction READ defaultRenameAction WRITE setDefaultRenameAction )
+    TQ_ENUMS( SelectionMode ResizeMode RenameAction )
+    TQ_PROPERTY( int columns READ columns )
+    TQ_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false )
+    TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
+    TQ_PROPERTY( int childCount READ childCount )
+    TQ_PROPERTY( bool allColumnsShowFocus READ allColumnsShowFocus WRITE setAllColumnsShowFocus )
+    TQ_PROPERTY( bool showSortIndicator READ showSortIndicator WRITE setShowSortIndicator )
+    TQ_PROPERTY( int itemMargin READ itemMargin WRITE setItemMargin )
+    TQ_PROPERTY( bool rootIsDecorated READ rootIsDecorated WRITE setRootIsDecorated )
+    TQ_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips )
+    TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
+    TQ_PROPERTY( int treeStepSize READ treeStepSize WRITE setTreeStepSize )
+    TQ_PROPERTY( RenameAction defaultRenameAction READ defaultRenameAction WRITE setDefaultRenameAction )
 
 public:
     TQListView( TQWidget* parent=0, const char* name=0, WFlags f = 0 );
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h
index 9cd213b9c..03a9eee6d 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -60,11 +60,11 @@ class TQPopupMenu;
 class Q_EXPORT TQMainWindow: public TQWidget
 {
     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 )
-    Q_PROPERTY( bool dockWindowsMovable READ dockWindowsMovable WRITE setDockWindowsMovable )
-    Q_PROPERTY( bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving )
+    TQ_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false )
+    TQ_PROPERTY( bool usesBigPixmaps READ usesBigPixmaps WRITE setUsesBigPixmaps )
+    TQ_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel )
+    TQ_PROPERTY( bool dockWindowsMovable READ dockWindowsMovable WRITE setDockWindowsMovable )
+    TQ_PROPERTY( bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving )
 
 public:
     TQMainWindow( TQWidget* parent=0, const char* name=0, WFlags f = WType_TopLevel );
diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h
index 46468d8ab..87e316fe3 100644
--- a/src/widgets/ntqmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -54,9 +54,9 @@ class TQPopupMenu;
 class Q_EXPORT TQMenuBar : public TQFrame, public TQMenuData
 {
     TQ_OBJECT
-    Q_ENUMS( Separator )
-    Q_PROPERTY( Separator separator READ separator WRITE setSeparator DESIGNABLE false )
-    Q_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp )
+    TQ_ENUMS( Separator )
+    TQ_PROPERTY( Separator separator READ separator WRITE setSeparator DESIGNABLE false )
+    TQ_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp )
 
 public:
     TQMenuBar( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h
index 88d33601d..ad073e376 100644
--- a/src/widgets/ntqmultilineedit.h
+++ b/src/widgets/ntqmultilineedit.h
@@ -54,11 +54,11 @@ class TQMultiLineEditData;
 class Q_EXPORT TQMultiLineEdit : public TQTextEdit
 {
     TQ_OBJECT
-    Q_PROPERTY( int numLines READ numLines )
-    Q_PROPERTY( bool atBeginning READ atBeginning )
-    Q_PROPERTY( bool atEnd READ atEnd )
-    Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
-    Q_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false )
+    TQ_PROPERTY( int numLines READ numLines )
+    TQ_PROPERTY( bool atBeginning READ atBeginning )
+    TQ_PROPERTY( bool atEnd READ atEnd )
+    TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
+    TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false )
 
 public:
     TQMultiLineEdit( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h
index af67e914e..c4415fdfb 100644
--- a/src/widgets/ntqpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -52,7 +52,7 @@ class TQPopupMenuPrivate;
 class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData
 {
     TQ_OBJECT
-    Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
+    TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
 public:
     TQPopupMenu( TQWidget* parent=0, const char* name=0 );
     ~TQPopupMenu();
diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/ntqprogressbar.h
index 038ddf83c..e4c66e99d 100644
--- a/src/widgets/ntqprogressbar.h
+++ b/src/widgets/ntqprogressbar.h
@@ -54,12 +54,12 @@ class TQProgressBarPrivate;
 class Q_EXPORT TQProgressBar : public TQFrame
 {
     TQ_OBJECT
-    Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
-    Q_PROPERTY( int progress READ progress WRITE setProgress )
-    Q_PROPERTY( TQString progressString READ progressString )
-    Q_PROPERTY( bool centerIndicator READ centerIndicator WRITE setCenterIndicator )
-    Q_PROPERTY( bool indicatorFollowsStyle READ indicatorFollowsStyle WRITE setIndicatorFollowsStyle )
-    Q_PROPERTY( bool percentageVisible READ percentageVisible WRITE setPercentageVisible )
+    TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
+    TQ_PROPERTY( int progress READ progress WRITE setProgress )
+    TQ_PROPERTY( TQString progressString READ progressString )
+    TQ_PROPERTY( bool centerIndicator READ centerIndicator WRITE setCenterIndicator )
+    TQ_PROPERTY( bool indicatorFollowsStyle READ indicatorFollowsStyle WRITE setIndicatorFollowsStyle )
+    TQ_PROPERTY( bool percentageVisible READ percentageVisible WRITE setPercentageVisible )
 
 public:
     TQProgressBar( TQWidget* parent=0, const char* name=0, WFlags f=0 );
diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/ntqpushbutton.h
index e8a317a5d..a09457828 100644
--- a/src/widgets/ntqpushbutton.h
+++ b/src/widgets/ntqpushbutton.h
@@ -54,14 +54,14 @@ class Q_EXPORT TQPushButton : public TQButton
 {
     TQ_OBJECT
 
-    Q_PROPERTY( bool autoDefault READ autoDefault WRITE setAutoDefault )
-    Q_PROPERTY( bool default READ isDefault WRITE setDefault )
-    Q_PROPERTY( bool menuButton READ isMenuButton DESIGNABLE false )
-    Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
-    Q_OVERRIDE( bool toggleButton WRITE setToggleButton )
-    Q_OVERRIDE( bool on WRITE setOn )
-    Q_PROPERTY( bool flat READ isFlat WRITE setFlat )
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_PROPERTY( bool autoDefault READ autoDefault WRITE setAutoDefault )
+    TQ_PROPERTY( bool default READ isDefault WRITE setDefault )
+    TQ_PROPERTY( bool menuButton READ isMenuButton DESIGNABLE false )
+    TQ_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
+    TQ_OVERRIDE( bool toggleButton WRITE setToggleButton )
+    TQ_OVERRIDE( bool on WRITE setOn )
+    TQ_PROPERTY( bool flat READ isFlat WRITE setFlat )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
     TQPushButton( TQWidget *parent, const char* name=0 );
diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/ntqradiobutton.h
index cfeefa272..3ff6d61eb 100644
--- a/src/widgets/ntqradiobutton.h
+++ b/src/widgets/ntqradiobutton.h
@@ -50,8 +50,8 @@
 class Q_EXPORT TQRadioButton : public TQButton
 {
     TQ_OBJECT
-    Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_PROPERTY( bool checked READ isChecked WRITE setChecked )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
     TQRadioButton( TQWidget *parent, const char* name=0 );
diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h
index a14d3ce0b..aff492470 100644
--- a/src/widgets/ntqscrollbar.h
+++ b/src/widgets/ntqscrollbar.h
@@ -53,14 +53,14 @@ class TQTimer;
 class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl
 {
     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 )
-    Q_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
-    Q_PROPERTY( int value READ value WRITE setValue )
-    Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
-    Q_PROPERTY( bool draggingSlider READ draggingSlider )
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+    TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
+    TQ_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
+    TQ_PROPERTY( int value READ value WRITE setValue )
+    TQ_PROPERTY( bool tracking READ tracking WRITE setTracking )
+    TQ_PROPERTY( bool draggingSlider READ draggingSlider )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
 
 public:
     TQScrollBar( TQWidget *parent, const char* name = 0 );
diff --git a/src/widgets/ntqscrollview.h b/src/widgets/ntqscrollview.h
index b2b0869a0..24a1322bd 100644
--- a/src/widgets/ntqscrollview.h
+++ b/src/widgets/ntqscrollview.h
@@ -52,18 +52,18 @@ class TQScrollViewData;
 class Q_EXPORT TQScrollView : public TQFrame
 {
     TQ_OBJECT
-    Q_ENUMS( ResizePolicy ScrollBarMode )
-    Q_PROPERTY( ResizePolicy resizePolicy READ resizePolicy WRITE setResizePolicy )
-    Q_PROPERTY( ScrollBarMode vScrollBarMode READ vScrollBarMode WRITE setVScrollBarMode )
-    Q_PROPERTY( ScrollBarMode hScrollBarMode READ hScrollBarMode WRITE setHScrollBarMode )
-    Q_PROPERTY( int visibleWidth READ visibleWidth )
-    Q_PROPERTY( int visibleHeight READ visibleHeight )
-    Q_PROPERTY( int contentsWidth READ contentsWidth )
-    Q_PROPERTY( int contentsHeight READ contentsHeight )
-    Q_PROPERTY( int contentsX READ contentsX )
-    Q_PROPERTY( int contentsY READ contentsY )
+    TQ_ENUMS( ResizePolicy ScrollBarMode )
+    TQ_PROPERTY( ResizePolicy resizePolicy READ resizePolicy WRITE setResizePolicy )
+    TQ_PROPERTY( ScrollBarMode vScrollBarMode READ vScrollBarMode WRITE setVScrollBarMode )
+    TQ_PROPERTY( ScrollBarMode hScrollBarMode READ hScrollBarMode WRITE setHScrollBarMode )
+    TQ_PROPERTY( int visibleWidth READ visibleWidth )
+    TQ_PROPERTY( int visibleHeight READ visibleHeight )
+    TQ_PROPERTY( int contentsWidth READ contentsWidth )
+    TQ_PROPERTY( int contentsHeight READ contentsHeight )
+    TQ_PROPERTY( int contentsX READ contentsX )
+    TQ_PROPERTY( int contentsY READ contentsY )
 #ifndef QT_NO_DRAGANDDROP
-    Q_PROPERTY( bool dragAutoScroll READ dragAutoScroll WRITE setDragAutoScroll )
+    TQ_PROPERTY( bool dragAutoScroll READ dragAutoScroll WRITE setDragAutoScroll )
 #endif
 
 public:
diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h
index 881e2abb2..f54179499 100644
--- a/src/widgets/ntqslider.h
+++ b/src/widgets/ntqslider.h
@@ -55,16 +55,16 @@ class TQTimer;
 class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl
 {
     TQ_OBJECT
-    Q_ENUMS( TickSetting )
-    Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
-    Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
-    Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
-    Q_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
-    Q_PROPERTY( int value READ value WRITE setValue )
-    Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
-    Q_PROPERTY( TickSetting tickmarks READ tickmarks WRITE setTickmarks )
-    Q_PROPERTY( int tickInterval READ tickInterval WRITE setTickInterval )
+    TQ_ENUMS( TickSetting )
+    TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+    TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
+    TQ_PROPERTY( int pageStep READ pageStep WRITE setPageStep )
+    TQ_PROPERTY( int value READ value WRITE setValue )
+    TQ_PROPERTY( bool tracking READ tracking WRITE setTracking )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_PROPERTY( TickSetting tickmarks READ tickmarks WRITE setTickmarks )
+    TQ_PROPERTY( int tickInterval READ tickInterval WRITE setTickInterval )
 	
 public:
     enum TickSetting { NoMarks = 0, Above = 1, Left = Above,
diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h
index deb0fd50b..11271bbc0 100644
--- a/src/widgets/ntqspinbox.h
+++ b/src/widgets/ntqspinbox.h
@@ -55,18 +55,18 @@ class TQSpinBoxPrivate;
 class Q_EXPORT TQSpinBox: public TQWidget, public TQRangeControl
 {
     TQ_OBJECT
-    Q_ENUMS( ButtonSymbols )
-    Q_PROPERTY( TQString text READ text )
-    Q_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
-    Q_PROPERTY( TQString suffix READ suffix WRITE setSuffix )
-    Q_PROPERTY( TQString cleanText READ cleanText )
-    Q_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText )
-    Q_PROPERTY( bool wrapping READ wrapping WRITE setWrapping )
-    Q_PROPERTY( ButtonSymbols buttonSymbols READ buttonSymbols WRITE setButtonSymbols )
-    Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
-    Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
-    Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
-    Q_PROPERTY( int value READ value WRITE setValue )
+    TQ_ENUMS( ButtonSymbols )
+    TQ_PROPERTY( TQString text READ text )
+    TQ_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
+    TQ_PROPERTY( TQString suffix READ suffix WRITE setSuffix )
+    TQ_PROPERTY( TQString cleanText READ cleanText )
+    TQ_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText )
+    TQ_PROPERTY( bool wrapping READ wrapping WRITE setWrapping )
+    TQ_PROPERTY( ButtonSymbols buttonSymbols READ buttonSymbols WRITE setButtonSymbols )
+    TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
+    TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
+    TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
+    TQ_PROPERTY( int value READ value WRITE setValue )
 
 public:
     TQSpinBox( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h
index 1a3742c32..138cdbfd9 100644
--- a/src/widgets/ntqsplitter.h
+++ b/src/widgets/ntqsplitter.h
@@ -86,10 +86,10 @@ public:
 class Q_EXPORT TQSplitter : public TQFrame
 {
     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 )
-    Q_PROPERTY( bool childrenCollapsible READ childrenCollapsible WRITE setChildrenCollapsible )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize )
+    TQ_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth )
+    TQ_PROPERTY( bool childrenCollapsible READ childrenCollapsible WRITE setChildrenCollapsible )
 
 public:
     // ### TQt 4.0: remove Auto from public API
diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h
index 53eb8ad52..894d1347f 100644
--- a/src/widgets/ntqstatusbar.h
+++ b/src/widgets/ntqstatusbar.h
@@ -54,7 +54,7 @@ class TQStatusBarPrivate;
 class Q_EXPORT TQStatusBar: public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
+    TQ_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
 
 public:
     TQStatusBar( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h
index a8271308b..1fd1b742b 100644
--- a/src/widgets/ntqtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -88,11 +88,11 @@ struct TQTabPrivate;
 class Q_EXPORT TQTabBar: public TQWidget
 {
     TQ_OBJECT
-    Q_ENUMS( Shape )
-    Q_PROPERTY( Shape shape READ shape WRITE setShape )
-    Q_PROPERTY( int currentTab READ currentTab WRITE setCurrentTab )
-    Q_PROPERTY( int count READ count )
-    Q_PROPERTY( int keyboardFocusTab READ keyboardFocusTab )
+    TQ_ENUMS( Shape )
+    TQ_PROPERTY( Shape shape READ shape WRITE setShape )
+    TQ_PROPERTY( int currentTab READ currentTab WRITE setCurrentTab )
+    TQ_PROPERTY( int count READ count )
+    TQ_PROPERTY( int keyboardFocusTab READ keyboardFocusTab )
 
 public:
     TQTabBar( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h
index c599d278d..0a58cf6a3 100644
--- a/src/widgets/ntqtabwidget.h
+++ b/src/widgets/ntqtabwidget.h
@@ -57,14 +57,14 @@ class TQWidgetStack;
 class Q_EXPORT TQTabWidget : public TQWidget
 {
     TQ_OBJECT
-    Q_ENUMS( TabPosition )
-    Q_ENUMS( TabShape )
-    Q_PROPERTY( TabPosition tabPosition READ tabPosition WRITE setTabPosition )
-    Q_PROPERTY( TabShape tabShape READ tabShape WRITE setTabShape )
-    Q_PROPERTY( int margin READ margin WRITE setMargin )
-    Q_PROPERTY( int currentPage READ currentPageIndex WRITE setCurrentPage )
-    Q_PROPERTY( int count READ count )
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_ENUMS( TabPosition )
+    TQ_ENUMS( TabShape )
+    TQ_PROPERTY( TabPosition tabPosition READ tabPosition WRITE setTabPosition )
+    TQ_PROPERTY( TabShape tabShape READ tabShape WRITE setTabShape )
+    TQ_PROPERTY( int margin READ margin WRITE setMargin )
+    TQ_PROPERTY( int currentPage READ currentPageIndex WRITE setCurrentPage )
+    TQ_PROPERTY( int count READ count )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
 public:
     TQTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h
index 6f3f1babf..834f72417 100644
--- a/src/widgets/ntqtextbrowser.h
+++ b/src/widgets/ntqtextbrowser.h
@@ -55,12 +55,12 @@ class TQTextBrowserData;
 class Q_EXPORT TQTextBrowser : public TQTextEdit
 {
     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 )
-    Q_OVERRIDE( bool modified SCRIPTABLE false)
-    Q_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false )
-    Q_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( TQString source READ source WRITE setSource )
+    TQ_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
+    TQ_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
+    TQ_OVERRIDE( bool modified SCRIPTABLE false)
+    TQ_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false )
+    TQ_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false )
 
 public:
     TQTextBrowser( TQWidget* parent=0, const char* name=0 );
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h
index fd3c4e021..a001dadce 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -138,27 +138,27 @@ class Q_EXPORT TQTextEdit : public TQScrollView
     friend class TQSyntaxHighlighter;
 
     TQ_OBJECT
-    Q_ENUMS( WordWrap WrapPolicy )
-    Q_SETS( AutoFormatting )
-    Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( TQBrush paper READ paper WRITE setPaper )
-    Q_PROPERTY( bool linkUnderline READ linkUnderline WRITE setLinkUnderline )
-    Q_PROPERTY( TQString documentTitle READ documentTitle )
-    Q_PROPERTY( int length READ length )
-    Q_PROPERTY( WordWrap wordWrap READ wordWrap WRITE setWordWrap )
-    Q_PROPERTY( int wrapColumnOrWidth READ wrapColumnOrWidth WRITE setWrapColumnOrWidth )
-    Q_PROPERTY( WrapPolicy wrapPolicy READ wrapPolicy WRITE setWrapPolicy )
-    Q_PROPERTY( bool hasSelectedText READ hasSelectedText )
-    Q_PROPERTY( TQString selectedText READ selectedText )
-    Q_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth )
-    Q_PROPERTY( bool overwriteMode READ isOverwriteMode WRITE setOverwriteMode )
-    Q_PROPERTY( bool modified READ isModified WRITE setModified DESIGNABLE false )
-    Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
-    Q_PROPERTY( bool undoRedoEnabled READ isUndoRedoEnabled WRITE setUndoRedoEnabled )
-    Q_PROPERTY( int tabStopWidth READ tabStopWidth WRITE setTabStopWidth )
-    Q_PROPERTY( bool tabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus )
-    Q_PROPERTY( AutoFormatting autoFormatting READ autoFormatting WRITE setAutoFormatting )
+    TQ_ENUMS( WordWrap WrapPolicy )
+    TQ_SETS( AutoFormatting )
+    TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( TQBrush paper READ paper WRITE setPaper )
+    TQ_PROPERTY( bool linkUnderline READ linkUnderline WRITE setLinkUnderline )
+    TQ_PROPERTY( TQString documentTitle READ documentTitle )
+    TQ_PROPERTY( int length READ length )
+    TQ_PROPERTY( WordWrap wordWrap READ wordWrap WRITE setWordWrap )
+    TQ_PROPERTY( int wrapColumnOrWidth READ wrapColumnOrWidth WRITE setWrapColumnOrWidth )
+    TQ_PROPERTY( WrapPolicy wrapPolicy READ wrapPolicy WRITE setWrapPolicy )
+    TQ_PROPERTY( bool hasSelectedText READ hasSelectedText )
+    TQ_PROPERTY( TQString selectedText READ selectedText )
+    TQ_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth )
+    TQ_PROPERTY( bool overwriteMode READ isOverwriteMode WRITE setOverwriteMode )
+    TQ_PROPERTY( bool modified READ isModified WRITE setModified DESIGNABLE false )
+    TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
+    TQ_PROPERTY( bool undoRedoEnabled READ isUndoRedoEnabled WRITE setUndoRedoEnabled )
+    TQ_PROPERTY( int tabStopWidth READ tabStopWidth WRITE setTabStopWidth )
+    TQ_PROPERTY( bool tabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus )
+    TQ_PROPERTY( AutoFormatting autoFormatting READ autoFormatting WRITE setAutoFormatting )
 
 public:
     enum WordWrap {
diff --git a/src/widgets/ntqtextview.h b/src/widgets/ntqtextview.h
index 848c692e6..342ed0db1 100644
--- a/src/widgets/ntqtextview.h
+++ b/src/widgets/ntqtextview.h
@@ -50,11 +50,11 @@
 class Q_EXPORT TQTextView : public TQTextEdit
 {
     TQ_OBJECT
-    Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
-    Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
-    Q_OVERRIDE( bool modified SCRIPTABLE false)
-    Q_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false )
-    Q_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false )
+    TQ_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
+    TQ_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
+    TQ_OVERRIDE( bool modified SCRIPTABLE false)
+    TQ_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false )
+    TQ_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false )
 
 public:
     TQTextView( const TQString& text, const TQString& context = TQString::null,
diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/ntqtoolbar.h
index 52e6127af..2036cc718 100644
--- a/src/widgets/ntqtoolbar.h
+++ b/src/widgets/ntqtoolbar.h
@@ -55,7 +55,7 @@ class TQToolBarPrivate;
 class Q_EXPORT TQToolBar: public TQDockWindow
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString label READ label WRITE setLabel )
+    TQ_PROPERTY( TQString label READ label WRITE setLabel )
 
 public:
     TQToolBar( const TQString &label,
diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/ntqtoolbox.h
index 9ad92aaa4..acd200cca 100644
--- a/src/widgets/ntqtoolbox.h
+++ b/src/widgets/ntqtoolbox.h
@@ -54,8 +54,8 @@ class TQWidgetList;
 class Q_EXPORT TQToolBox : public TQFrame
 {
     TQ_OBJECT
-    Q_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex )
-    Q_PROPERTY( int count READ count )
+    TQ_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex )
+    TQ_PROPERTY( int count READ count )
 
 public:
     TQToolBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h
index e78cf33f6..5ac2ad019 100644
--- a/src/widgets/ntqtoolbutton.h
+++ b/src/widgets/ntqtoolbutton.h
@@ -57,22 +57,22 @@ class TQPopupMenu;
 class Q_EXPORT TQToolButton : public TQButton
 {
     TQ_OBJECT
-    Q_ENUMS( TextPosition )
-
-    Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
-    Q_PROPERTY( TQIconSet onIconSet READ onIconSet WRITE setOnIconSet DESIGNABLE false STORED false )
-    Q_PROPERTY( TQIconSet offIconSet READ offIconSet WRITE setOffIconSet DESIGNABLE false STORED false )
-    Q_PROPERTY( bool usesBigPixmap READ usesBigPixmap WRITE setUsesBigPixmap )
-    Q_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel )
-    Q_PROPERTY( TQString textLabel READ textLabel WRITE setTextLabel )
-    Q_PROPERTY( int popupDelay READ popupDelay WRITE setPopupDelay )
-    Q_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise )
-    Q_PROPERTY( TextPosition textPosition READ textPosition WRITE setTextPosition )
-
-    Q_OVERRIDE( bool toggleButton WRITE setToggleButton )
-    Q_OVERRIDE( bool on WRITE setOn )
-    Q_OVERRIDE( TQPixmap pixmap DESIGNABLE false STORED false )
-    Q_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true)
+    TQ_ENUMS( TextPosition )
+
+    TQ_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
+    TQ_PROPERTY( TQIconSet onIconSet READ onIconSet WRITE setOnIconSet DESIGNABLE false STORED false )
+    TQ_PROPERTY( TQIconSet offIconSet READ offIconSet WRITE setOffIconSet DESIGNABLE false STORED false )
+    TQ_PROPERTY( bool usesBigPixmap READ usesBigPixmap WRITE setUsesBigPixmap )
+    TQ_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel )
+    TQ_PROPERTY( TQString textLabel READ textLabel WRITE setTextLabel )
+    TQ_PROPERTY( int popupDelay READ popupDelay WRITE setPopupDelay )
+    TQ_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise )
+    TQ_PROPERTY( TextPosition textPosition READ textPosition WRITE setTextPosition )
+
+    TQ_OVERRIDE( bool toggleButton WRITE setToggleButton )
+    TQ_OVERRIDE( bool on WRITE setOn )
+    TQ_OVERRIDE( TQPixmap pixmap DESIGNABLE false STORED false )
+    TQ_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true)
 
 public:
     enum TextPosition {
diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h
index 21cb0c397..7a325ade4 100644
--- a/src/widgets/ntqtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -56,8 +56,8 @@ class TQListViewToolTip;
 class Q_EXPORT TQToolTipGroup: public TQObject
 {
     TQ_OBJECT
-    Q_PROPERTY( bool delay READ delay WRITE setDelay )
-    Q_PROPERTY( bool enabled READ enabled WRITE setEnabled )
+    TQ_PROPERTY( bool delay READ delay WRITE setDelay )
+    TQ_PROPERTY( bool enabled READ enabled WRITE setEnabled )
 
 public:
     TQToolTipGroup( TQObject *parent, const char *name = 0 );
diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h
index 95696343e..ade5fd7b9 100644
--- a/src/widgets/ntqvalidator.h
+++ b/src/widgets/ntqvalidator.h
@@ -73,8 +73,8 @@ private:
 class Q_EXPORT TQIntValidator : public TQValidator
 {
     TQ_OBJECT
-    Q_PROPERTY( int bottom READ bottom WRITE setBottom )
-    Q_PROPERTY( int top READ top WRITE setTop )
+    TQ_PROPERTY( int bottom READ bottom WRITE setBottom )
+    TQ_PROPERTY( int top READ top WRITE setTop )
 
 public:
     TQIntValidator( TQObject * parent, const char *name = 0 );
@@ -105,9 +105,9 @@ private:
 class Q_EXPORT TQDoubleValidator : public TQValidator
 {
     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 )
+    TQ_PROPERTY( double bottom READ bottom WRITE setBottom )
+    TQ_PROPERTY( double top READ top WRITE setTop )
+    TQ_PROPERTY( int decimals READ decimals WRITE setDecimals )
 
 public:
     TQDoubleValidator( TQObject * parent, const char *name = 0 );
@@ -140,7 +140,7 @@ private:
 class Q_EXPORT TQRegExpValidator : public TQValidator
 {
     TQ_OBJECT
-    // Q_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp )
+    // TQ_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp )
 
 public:
     TQRegExpValidator( TQObject *parent, const char *name = 0 );
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 0f4a28e31..d4cd0b126 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -308,7 +308,7 @@ static TQPoint realWidgetPos( TQDockWindow *w )
 class TQDockWindowHandle : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString caption READ caption )
+    TQ_PROPERTY( TQString caption READ caption )
     friend class TQDockWindow;
     friend class TQDockWindowTitleBar;
 
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index bf6e9e819..2317b8da6 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -69,8 +69,8 @@ class TQPixmap;
 class Q_EXPORT TQTitleBar : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise )
-    Q_PROPERTY( bool movable READ isMovable WRITE setMovable )
+    TQ_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise )
+    TQ_PROPERTY( bool movable READ isMovable WRITE setMovable )
 
 public:
     TQTitleBar (TQWidget* w, TQWidget* parent, const char* name=0);