From 7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 20 Oct 2012 20:01:48 -0500 Subject: Automated update from Qt3 --- doc/html/activeqt-dotnet.html | 4 +- doc/html/designer-manual-7.html | 8 +- doc/html/moc.html | 26 ++-- doc/html/ntqsqlpropertymap.html | 2 +- doc/html/properties.html | 36 +++--- doc/html/qaction-h.html | 26 ++-- doc/html/qassistantclient-h.html | 2 +- doc/html/qaxbase-h.html | 2 +- doc/html/qaxbindable.html | 2 +- doc/html/qaxfactory.html | 14 +-- doc/html/qaxserver-example-hierarchy.html | 2 +- doc/html/qaxserver-example-multiple.html | 32 ++--- doc/html/qaxserver-example-simple.html | 4 +- doc/html/qaxserver.html | 28 ++--- doc/html/qbutton-h.html | 24 ++-- doc/html/qbuttongroup-h.html | 6 +- doc/html/qcheckbox-h.html | 6 +- doc/html/qcombobox-h.html | 24 ++-- doc/html/qdatabrowser-h.html | 20 ++-- doc/html/qdatatable-h.html | 28 ++--- doc/html/qdatetimeedit-h.html | 26 ++-- doc/html/qdial-h.html | 20 ++-- doc/html/qdialog-h.html | 4 +- doc/html/qdockarea-h.html | 10 +- doc/html/qdockwindow-h.html | 22 ++-- doc/html/qfiledialog-h.html | 22 ++-- doc/html/qframe-h.html | 18 +-- doc/html/qgridview-h.html | 8 +- doc/html/qgroupbox-h.html | 14 +-- doc/html/qheader-h.html | 12 +- doc/html/qiconview-h.html | 36 +++--- doc/html/qlabel-h.html | 14 +-- doc/html/qlayout-h.html | 8 +- doc/html/qlcdnumber-h.html | 14 +-- doc/html/qlineedit-h.html | 40 +++---- doc/html/qlistbox-h.html | 28 ++--- doc/html/qlistview-h.html | 26 ++-- doc/html/qmainwindow-h.html | 10 +- doc/html/qmenubar-h.html | 6 +- doc/html/qmessagebox-h.html | 10 +- doc/html/qmultilineedit-h.html | 10 +- doc/html/qobject-h.html | 2 +- doc/html/qpopupmenu-h.html | 2 +- doc/html/qprogressbar-h.html | 12 +- doc/html/qprogressdialog-h.html | 16 +-- doc/html/qpushbutton-h.html | 16 +-- doc/html/qradiobutton-h.html | 4 +- doc/html/qscrollbar-h.html | 16 +-- doc/html/qscrollview-h.html | 22 ++-- doc/html/qslider-h.html | 20 ++-- doc/html/qspinbox-h.html | 24 ++-- doc/html/qsplitter-h.html | 8 +- doc/html/qsqldatabase-h.html | 12 +- doc/html/qstatusbar-h.html | 2 +- doc/html/qtabbar-h.html | 10 +- doc/html/qtable-h.html | 22 ++-- doc/html/qtabwidget-h.html | 16 +-- doc/html/qtextbrowser-h.html | 12 +- doc/html/qtextedit-h.html | 42 +++---- doc/html/qtextview-h.html | 10 +- doc/html/qtoolbar-h.html | 2 +- doc/html/qtoolbox-h.html | 4 +- doc/html/qtoolbutton-h.html | 32 ++--- doc/html/qtooltip-h.html | 4 +- doc/html/qvalidator-h.html | 12 +- doc/html/qwidget-h.html | 132 ++++++++++----------- doc/html/qwizard-h.html | 2 +- doc/html/qworkspace-h.html | 2 +- doc/html/sql-overview-custom1-main-h.html | 2 +- doc/html/sql-overview-table3-main-h.html | 2 +- doc/html/sql-overview-table4-main-h.html | 2 +- doc/html/sql.html | 4 +- doc/man/man1/moc.1 | 12 +- doc/man/man3/qaxbindable.3qt | 2 +- doc/man/man3/qaxfactory.3qt | 14 +-- doc/man/man3/qsqlpropertymap.3qt | 2 +- doc/moc.doc | 26 ++-- doc/object.doc | 36 +++--- examples/demo/dnd/styledbutton.h | 10 +- examples/sql/overview/custom1/main.h | 2 +- examples/sql/overview/table3/main.h | 2 +- examples/sql/overview/table4/main.h | 2 +- src/attic/qtmultilineedit.h | 42 +++---- src/dialogs/ntqdialog.h | 4 +- src/dialogs/ntqfiledialog.h | 22 ++-- src/dialogs/ntqmessagebox.h | 10 +- src/dialogs/ntqprogressdialog.h | 16 +-- src/dialogs/ntqwizard.h | 2 +- src/dialogs/qcolordialog.cpp | 4 +- src/iconview/ntqiconview.h | 36 +++--- src/kernel/ntqlayout.h | 8 +- src/kernel/ntqobject.h | 2 +- src/kernel/ntqobjectdefs.h | 20 ++-- src/kernel/ntqwidget.h | 132 ++++++++++----------- src/moc/moc.l | 20 ++-- src/moc/moc.y | 50 ++++---- src/moc/moc_lex.cpp | 20 ++-- src/moc/moc_yacc.cpp | 52 ++++---- src/moc/moc_yacc.h | 20 ++-- src/sql/ntqdatabrowser.h | 20 ++-- src/sql/ntqdatatable.h | 28 ++--- src/sql/ntqsqldatabase.h | 12 +- src/sql/qsqlpropertymap.cpp | 2 +- src/table/ntqtable.h | 22 ++-- src/widgets/ntqaction.h | 26 ++-- src/widgets/ntqbutton.h | 24 ++-- src/widgets/ntqbuttongroup.h | 6 +- src/widgets/ntqcheckbox.h | 6 +- src/widgets/ntqcombobox.h | 24 ++-- src/widgets/ntqdatetimeedit.h | 26 ++-- src/widgets/ntqdial.h | 20 ++-- src/widgets/ntqdockarea.h | 10 +- src/widgets/ntqdockwindow.h | 22 ++-- src/widgets/ntqframe.h | 18 +-- src/widgets/ntqgridview.h | 8 +- src/widgets/ntqgroupbox.h | 14 +-- src/widgets/ntqheader.h | 12 +- src/widgets/ntqlabel.h | 14 +-- src/widgets/ntqlcdnumber.h | 14 +-- src/widgets/ntqlineedit.h | 40 +++---- src/widgets/ntqlistbox.h | 28 ++--- src/widgets/ntqlistview.h | 26 ++-- src/widgets/ntqmainwindow.h | 10 +- src/widgets/ntqmenubar.h | 6 +- src/widgets/ntqmultilineedit.h | 10 +- src/widgets/ntqpopupmenu.h | 2 +- src/widgets/ntqprogressbar.h | 12 +- src/widgets/ntqpushbutton.h | 16 +-- src/widgets/ntqradiobutton.h | 4 +- src/widgets/ntqscrollbar.h | 16 +-- src/widgets/ntqscrollview.h | 22 ++-- src/widgets/ntqslider.h | 20 ++-- src/widgets/ntqspinbox.h | 24 ++-- src/widgets/ntqsplitter.h | 8 +- src/widgets/ntqstatusbar.h | 2 +- src/widgets/ntqtabbar.h | 10 +- src/widgets/ntqtabwidget.h | 16 +-- src/widgets/ntqtextbrowser.h | 12 +- src/widgets/ntqtextedit.h | 42 +++---- src/widgets/ntqtextview.h | 10 +- src/widgets/ntqtoolbar.h | 2 +- src/widgets/ntqtoolbox.h | 4 +- src/widgets/ntqtoolbutton.h | 32 ++--- src/widgets/ntqtooltip.h | 4 +- src/widgets/ntqvalidator.h | 12 +- src/widgets/qdockwindow.cpp | 2 +- src/widgets/qtitlebar_p.h | 4 +- src/workspace/ntqworkspace.h | 2 +- tools/assistant/lib/ntqassistantclient.h | 2 +- tools/designer/designer/formwindow.h | 2 +- tools/designer/designer/layout.h | 12 +- tools/designer/designer/propertyeditor.cpp | 2 +- tools/designer/designer/qcompletionedit.h | 4 +- tools/designer/designer/styledbutton.h | 10 +- tools/designer/designer/widgetfactory.h | 46 +++---- .../examples/filechooser/widget/filechooser.h | 6 +- tools/designer/examples/opengl/glwidget.h | 8 +- tools/designer/examples/sizeaware/sizeaware.h | 4 +- 158 files changed, 1256 insertions(+), 1256 deletions(-) diff --git a/doc/html/activeqt-dotnet.html b/doc/html/activeqt-dotnet.html index ce36ca105..0df4d63c3 100644 --- a/doc/html/activeqt-dotnet.html +++ b/doc/html/activeqt-dotnet.html @@ -133,7 +133,7 @@ managed programming language. class Worker : public TQObject { TQ_OBJECT - Q_PROPERTY(TQString statusString READ statusString WRITE setStatusString) + TQ_PROPERTY(TQString statusString READ statusString WRITE setStatusString) public: Worker(); @@ -150,7 +150,7 @@ managed programming language. };

The TQt class has nothing unusual for TQt users, and as even the TQt -specialities like Q_PROPERTY, slots and signals are +specialities like TQ_PROPERTY, slots and signals are implemented with straight C++ they don't cause any trouble when compiling this class with any C++ compiler.

diff --git a/doc/html/designer-manual-7.html b/doc/html/designer-manual-7.html index 339153a3d..ac49f1c55 100644 --- a/doc/html/designer-manual-7.html +++ b/doc/html/designer-manual-7.html @@ -128,14 +128,14 @@ DBFILE = vcr.db

Our widget will be derived from TQWidget so we include the ntqwidget.h header file. We also forward declare the two classes that our widget will be built from.


- 
We include the TQ_OBJECT macro since this is required for classes that declare signals or slots. The Q_ENUMS declaration is used to register the Mode enumeration. Our widget has two properties, mode, to store whether the user should select a File or a Directory and fileName which stores the file or directory they chose.

+ 
We include the TQ_OBJECT macro since this is required for classes that declare signals or slots. The TQ_ENUMS declaration is used to register the Mode enumeration. Our widget has two properties, mode, to store whether the user should select a File or a Directory and fileName which stores the file or directory they chose.

 
    class QT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget
     {
         TQ_OBJECT
 
-        Q_ENUMS( Mode )
-        Q_PROPERTY( Mode mode READ mode WRITE setMode )
-        Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+        TQ_ENUMS( Mode )
+        TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+        TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
     public:
         FileChooser( TQWidget *parent = 0, const char *name = 0);
diff --git a/doc/html/moc.html b/doc/html/moc.html
index ba6c33df7..5f257f162 100644
--- a/doc/html/moc.html
+++ b/doc/html/moc.html
@@ -72,8 +72,8 @@ like this:
 

  
 
 In addition to the signals and slots shown above, the moc also
-implements object properties as in the next example. The Q_PROPERTY
-macro declares an object property, while Q_ENUMS declares a list of
+implements object properties as in the next example. The TQ_PROPERTY
+macro declares an object property, while TQ_ENUMS declares a list of
 enumeration types within the class to be usable inside the 
 property system.  In this particular
 case we declare a property of the enumeration type Priority that is
@@ -83,8 +83,8 @@ function setPriority().
     class MyClass : public TQObject
     {
         TQ_OBJECT
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-        Q_ENUMS( Priority )
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+        TQ_ENUMS( Priority )
     public:
         MyClass( TQObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -95,16 +95,16 @@ function setPriority().
     };
 
  
-
 Properties can be modified in subclasses with the Q_OVERRIDE
-macro. The Q_SETS macro declares enums that are to be used as
-sets, i.e. OR'ed together. Another macro, Q_CLASSINFO, can be used to
+
 Properties can be modified in subclasses with the TQ_OVERRIDE
+macro. The TQ_SETS macro declares enums that are to be used as
+sets, i.e. OR'ed together. Another macro, TQ_CLASSINFO, can be used to
 attach additional name/value-pairs to the class' meta object:
 
 
     class MyClass : public TQObject
     {
         TQ_OBJECT
-        Q_CLASSINFO( "Author", "Oscar Peterson")
-        Q_CLASSINFO( "Status", "Active")
+        TQ_CLASSINFO( "Author", "Oscar Peterson")
+        TQ_CLASSINFO( "Status", "Active")
     public:
         MyClass( TQObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -416,8 +416,8 @@ illegal syntax:
         TQ_OBJECT
     public:
         ...
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority ) // WRONG
-        Q_ENUMS( Priority ) // WRONG
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority ) // WRONG
+        TQ_ENUMS( Priority ) // WRONG
         enum Priority { High, Low, VeryHigh, VeryLow };
         void setPriority( Priority );
         Priority priority() const;
@@ -430,8 +430,8 @@ beginning of the class declaration, right after TQ_OBJECT:
 
 
     class SomeClass : public TQObject {
         TQ_OBJECT
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-        Q_ENUMS( Priority )
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+        TQ_ENUMS( Priority )
     public:
         ...
         enum Priority { High, Low, VeryHigh, VeryLow };
diff --git a/doc/html/ntqsqlpropertymap.html b/doc/html/ntqsqlpropertymap.html
index 76a6bdbee..4f2b65864 100644
--- a/doc/html/ntqsqlpropertymap.html
+++ b/doc/html/ntqsqlpropertymap.html
@@ -164,7 +164,7 @@ Returns the application global TQSqlPropertyMap.
 
void TQSqlPropertyMap::insert ( const TQString & classname, const TQString & property )
 

 Insert a new classname/property pair, which is used for custom SQL
-field editors. There must be a Q_PROPERTY clause in the classname class declaration for the property.
+field editors. There must be a TQ_PROPERTY clause in the classname class declaration for the property.
 
 
Example: sql/overview/custom1/main.cpp.
 
void TQSqlPropertyMap::installDefaultMap ( TQSqlPropertyMap * map ) [static]
diff --git a/doc/html/properties.html b/doc/html/properties.html
index c40fbaf0f..388fc48b1 100644
--- a/doc/html/properties.html
+++ b/doc/html/properties.html
@@ -40,9 +40,9 @@ features like __property or [property]. Our solution works wit
 any standard C++ compiler on every platform we support. It's based
 on the meta-object system that also provides object communication
 through signals and slots.
-
 The Q_PROPERTY macro in a class declaration declares a
-property. Properties can only be declared in classes that inherit TQObject. A second macro, Q_OVERRIDE, can be used to override some
-aspects of an inherited property in a subclass. (See Q_OVERRIDE.)
+
 The TQ_PROPERTY macro in a class declaration declares a
+property. Properties can only be declared in classes that inherit TQObject. A second macro, TQ_OVERRIDE, can be used to override some
+aspects of an inherited property in a subclass. (See TQ_OVERRIDE.)
 
 To the outer world, a property appears to be similar to a data member.
 But properties have several features that distinguish them from
 ordinary data members:
@@ -100,9 +100,9 @@ functions in use:
 

  
 
 The class has a property "priority" that is not yet known to the meta object system. In order to make the property known, you must
-declare it with the Q_PROPERTY macro. The syntax is as follows:
+declare it with the TQ_PROPERTY macro. The syntax is as follows:
 
 
-Q_PROPERTY( type name READ getFunction [WRITE setFunction]
+TQ_PROPERTY( type name READ getFunction [WRITE setFunction]
             [RESET resetFunction] [DESIGNABLE bool] 
             [SCRIPTABLE bool] [STORED bool] )
 

@@ -127,14 +127,14 @@ these cases the type must be specified as TQValueLis
  
 In the case of TQValueList and TQMap properties the value passes
 is a TQVariant whose value is the entire list or map.
-
 Enumeration types are registered with the Q_ENUMS macro. Here's the
+
 Enumeration types are registered with the TQ_ENUMS macro. Here's the
 final class declaration including the property related declarations:
 
 
     class MyClass : public TQObject
     {
         TQ_OBJECT
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-        Q_ENUMS( Priority )
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+        TQ_ENUMS( Priority )
     public:
         MyClass( TQObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -145,12 +145,12 @@ final class declaration including the property related declarations:
     };
 

  
-
 Another similar macro is Q_SETS. Like Q_ENUMS, it registers an
+
 Another similar macro is TQ_SETS. Like TQ_ENUMS, it registers an
 enumeration type but marks it in addition as a "set", i.e. the
 enumeration values can be OR-ed together. An I/O class might have
 enumeration values "Read" and "Write" and accept "Read|Write": such an
-enum is best handled with Q_SETS, rather than Q_ENUMS.
-
 The remaining keywords in the Q_PROPERTY section are RESET, DESIGNABLE, SCRIPTABLE and STORED.
+enum is best handled with TQ_SETS, rather than TQ_ENUMS.
+
 The remaining keywords in the TQ_PROPERTY section are RESET, DESIGNABLE, SCRIPTABLE and STORED.
 
 RESET names a function that will set the property to its default
 state (which may have changed since initialization). The function
 must return void and take no arguments.
@@ -165,24 +165,24 @@ when storing an object's state. Stored makes only sense for writable
 properties. The default value is TRUE. Technically superfluous
 properties (like TQPoint pos if TQRect geometry is already a property)
 define this to be FALSE.
-
 Connected to the property system is an additional macro, "Q_CLASSINFO",
+
 Connected to the property system is an additional macro, "TQ_CLASSINFO",
 that can be used to attach additional name/value-pairs to a class'
 meta object, for example:
 
 
-    Q_CLASSINFO( "Version", "3.0.0" )
+    TQ_CLASSINFO( "Version", "3.0.0" )
 

  
 
 Like other meta data, class information is accessible at runtime
 through the meta object, see TQMetaObject::classInfo() for details.
 
 
-
 Q_OVERRIDE
+
 TQ_OVERRIDE
 

 
 When you inherit a TQObject subclass you may wish to override some
 aspects of some of the class's properties.
 
 For example, in TQWidget we have the autoMask property defined like
 this:
 
-    Q_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
 

  
 
 But we need to make the auto mask property designable in some TQWidget
@@ -191,20 +191,20 @@ scriptable (e.g. for TQSA). This is achieved by overriding these
 features of the property in a subclass. In TQCheckBox, for example, we
 achieve this using the following code:
 
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 

  
 
 Another example is TQToolButton. By default TQToolButton has a read-only
 "toggleButton" property, because that's what it inherits from TQButton:
 
-    Q_PROPERTY( bool toggleButton READ isToggleButton )
+    TQ_PROPERTY( bool toggleButton READ isToggleButton )
 

  
 
 But we want to make our tool buttons able to be toggled, so we write a
 WRITE function in TQToolButton, and use the following property override
 to make it acessible:
 
-    Q_OVERRIDE( bool toggleButton WRITE setToggleButton )
+    TQ_OVERRIDE( bool toggleButton WRITE setToggleButton )
 

  
 The result is read-write (and scriptable and designable, since we now
diff --git a/doc/html/qaction-h.html b/doc/html/qaction-h.html
index df70a1edd..10baaa26b 100644
--- a/doc/html/qaction-h.html
+++ b/doc/html/qaction-h.html
@@ -95,19 +95,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 );
@@ -190,8 +190,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/doc/html/qassistantclient-h.html b/doc/html/qassistantclient-h.html
index 602bdfe5d..d11adc5ec 100644
--- a/doc/html/qassistantclient-h.html
+++ b/doc/html/qassistantclient-h.html
@@ -77,7 +77,7 @@ class TQProcess;
 class TQAssistantClient : public TQObject
 {
     TQ_OBJECT
-    Q_PROPERTY( bool open READ isOpen )
+    TQ_PROPERTY( bool open READ isOpen )
 
 public:
     TQAssistantClient( const TQString &path, TQObject *parent = 0, const char *name = 0 );
diff --git a/doc/html/qaxbase-h.html b/doc/html/qaxbase-h.html
index 10440a1ef..a03cd20f3 100644
--- a/doc/html/qaxbase-h.html
+++ b/doc/html/qaxbase-h.html
@@ -81,7 +81,7 @@ class TQAxBase
 {
 #ifdef Q_QDOC
 #error "The Symbol Q_QDOC is reserved for documentation purposes."
-    Q_PROPERTY( TQString control READ control WRITE setControl )
+    TQ_PROPERTY( TQString control READ control WRITE setControl )
 #endif
 public:
 #ifndef Q_QDOC
diff --git a/doc/html/qaxbindable.html b/doc/html/qaxbindable.html
index fe1869eec..deea539e7 100644
--- a/doc/html/qaxbindable.html
+++ b/doc/html/qaxbindable.html
@@ -71,7 +71,7 @@ TQWidget first.
     class MyActiveX : public TQWidget, public TQAxBindable
     {
         TQ_OBJECT
-        Q_PROPERTY( int value READ value WRITE setValue )
+        TQ_PROPERTY( int value READ value WRITE setValue )
     public:
         MyActiveX( TQWidget *parent = 0, const char *name = 0 );
         ...
diff --git a/doc/html/qaxfactory.html b/doc/html/qaxfactory.html
index a4e86a330..f52bc07b4 100644
--- a/doc/html/qaxfactory.html
+++ b/doc/html/qaxfactory.html
@@ -154,7 +154,7 @@ and export it:
         )
     

  
-
 If you use the Q_CLASSINFO macro to provide the unique identifiers
+
 If you use the TQ_CLASSINFO macro to provide the unique identifiers
 or other attributes for your class you can use the TQAXFACTORY_BEGIN,
 TQAXCLASS and TQAXFACTORY_END macros to expose one or more classes
 as COM objects.
@@ -210,7 +210,7 @@ Reimplement this function to return the class identifier for each
 key returned by the featureList() implementation, or an empty
 TQUuid if this factory doesn't support the value of key.
 
 The default implementation interprets key as the class name,
-and returns the value of the Q_CLASSINFO entry "ClassID".
+and returns the value of the TQ_CLASSINFO entry "ClassID".
 
 
TQWidget * TQAxFactory::create ( const TQString & key, TQWidget * parent = 0, const char * name = 0 ) [virtual]
 

@@ -247,7 +247,7 @@ interface for each key returned by the featureLi
 implementation, or an empty TQUuid if this factory doesn't support
 the value of key.
 
 The default implementation interprets key as the class name,
-and returns the value of the Q_CLASSINFO entry "EventsID".
+and returns the value of the TQ_CLASSINFO entry "EventsID".
 
 
TQString TQAxFactory::exposeToSuperClass ( const TQString & key ) const [virtual]
 

@@ -255,7 +255,7 @@ Reimplement this function to return the name of the super class of
 key up to which methods and properties should be exposed by the
 ActiveX control.
 
 The default implementation interprets key as the class name,
-and returns the value of the Q_CLASSINFO entry "ToSuperClass". If
+and returns the value of the TQ_CLASSINFO entry "ToSuperClass". If
 no such value is set the null-string is returned, and the functions 
 and properties of all the super classes including TQWidget will be 
 exposed.
@@ -283,7 +283,7 @@ Reimplement this function to return TRUE if the ActiveX control
 
  •  MouseMove
 
 
     The default implementation interprets key as the class name,
-and returns TRUE if the value of the Q_CLASSINFO entry "StockEvents"
+and returns TRUE if the value of the TQ_CLASSINFO entry "StockEvents"
 is "yes". Otherwise this function returns FALSE.
 
 
    TQUuid TQAxFactory::interfaceID ( const TQString & key ) const [virtual]
@@ -292,7 +292,7 @@ Reimplement this function to return the interface identifier for
 each key returned by the featureList() implementation, or an
 empty TQUuid if this factory doesn't support the value of key.
 
     The default implementation interprets key as the class name,
-and returns the value of the Q_CLASSINFO entry "InterfaceID".
+and returns the value of the TQ_CLASSINFO entry "InterfaceID".
 
 
    bool TQAxFactory::isServer () [static]
 
    
@@ -406,7 +406,7 @@ system registry using the settings object.
 Reimplement this function to return TRUE if licenseKey is a valid
 license for the class key, or if the current machine is licensed.
 
     The default implementation returns TRUE if the class key is not
-licensed (ie. no Q_CLASSINFO attribute "LicenseKey"), or if 
+licensed (ie. no TQ_CLASSINFO attribute "LicenseKey"), or if 
 licenseKey matches the value of the "LicenseKey" attribute, or
 if the machine is licensed through a .LIC file with the same filename
 as this COM server.
diff --git a/doc/html/qaxserver-example-hierarchy.html b/doc/html/qaxserver-example-hierarchy.html
index eb1cf33eb..80b3a1ee1 100644
--- a/doc/html/qaxserver-example-hierarchy.html
+++ b/doc/html/qaxserver-example-hierarchy.html
@@ -86,7 +86,7 @@ name.
 
        class TQSubWidget : public TQWidget
     {
         TQ_OBJECT
-        Q_PROPERTY( TQString label READ label WRITE setLabel )
+        TQ_PROPERTY( TQString label READ label WRITE setLabel )
     public:
         TQSubWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 
diff --git a/doc/html/qaxserver-example-multiple.html b/doc/html/qaxserver-example-multiple.html
index 4336e29c7..045a6f4b9 100644
--- a/doc/html/qaxserver-example-multiple.html
+++ b/doc/html/qaxserver-example-multiple.html
@@ -35,8 +35,8 @@ body { background: #ffffff; color: black; }
 
 The ActiveX controls in this example are simple TQWidget
 subclasses reimplementing the paintEvent() method. The classes use
-the Q_CLASSINFO macro to 
-
     The example demonstrates the use of the Q_CLASSINFO macro to set 
+the TQ_CLASSINFO macro to 
+
     The example demonstrates the use of the TQ_CLASSINFO macro to set 
 ActiveTQt-specific attributes for TQObject sub classes, and the use of
 the TQAXFACTORY_BEGIN, TQAXCLASS and TQAXFACTORY_END macros.
 
     
@@ -44,12 +44,12 @@ the TQAXFACTORY_BEGIN, TQWidget
     {
         TQ_OBJECT
-        Q_CLASSINFO("ClassID", "{1D9928BD-4453-4bdd-903D-E525ED17FDE5}")
-        Q_CLASSINFO("InterfaceID", "{99F6860E-2C5A-42ec-87F2-43396F4BE389}")
-        Q_CLASSINFO("EventsID", "{0A3E9F27-E4F1-45bb-9E47-63099BCCD0E3}")
+        TQ_CLASSINFO("ClassID", "{1D9928BD-4453-4bdd-903D-E525ED17FDE5}")
+        TQ_CLASSINFO("InterfaceID", "{99F6860E-2C5A-42ec-87F2-43396F4BE389}")
+        TQ_CLASSINFO("EventsID", "{0A3E9F27-E4F1-45bb-9E47-63099BCCD0E3}")
 
    The class declaration includes the TQ_OBJECT macro to activate TQt's meta object system, and sets COM identifiers for the class using the 
-Q_CLASSINFO macro.
-
            Q_PROPERTY( TQColor fillColor READ fillColor WRITE setFillColor )
+TQ_CLASSINFO macro.
+
            TQ_PROPERTY( TQColor fillColor READ fillColor WRITE setFillColor )
     public:
         TQAxWidget1( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 )
             : TQWidget( parent, name, f ), fill_color( red )
@@ -79,22 +79,22 @@ Q_CLASSINFO macro.
         TQColor fill_color;
     };
 
    The control draws a filled rectangle. The fill color is exposed as a 
-property using the Q_PROPERTY macro.
+property using the TQ_PROPERTY macro.
 
     
 
 
        class TQAxWidget2 : public TQWidget
     {
         TQ_OBJECT
-        Q_CLASSINFO("ClassID", "{58139D56-6BE9-4b17-937D-1B1EDEDD5B71}")
-        Q_CLASSINFO("InterfaceID", "{B66280AB-08CC-4dcc-924F-58E6D7975B7D}")
-        Q_CLASSINFO("EventsID", "{D72BACBA-03C4-4480-B4BB-DE4FE3AA14A0}")
-        Q_CLASSINFO("ToSuperClass", "TQAxWidget2")
-        Q_CLASSINFO("StockEvents", "yes")
-
    The declaration of the second control class uses the Q_CLASSINFO macro
+        TQ_CLASSINFO("ClassID", "{58139D56-6BE9-4b17-937D-1B1EDEDD5B71}")
+        TQ_CLASSINFO("InterfaceID", "{B66280AB-08CC-4dcc-924F-58E6D7975B7D}")
+        TQ_CLASSINFO("EventsID", "{D72BACBA-03C4-4480-B4BB-DE4FE3AA14A0}")
+        TQ_CLASSINFO("ToSuperClass", "TQAxWidget2")
+        TQ_CLASSINFO("StockEvents", "yes")
+
    The declaration of the second control class uses the TQ_CLASSINFO macro
 to set the COM identifiers as well as additional COM attributes for the
 class. Objects of that class will not expose the TQWidget API, and provide
 the ActiveX stock events (ie. Click, KeyDown etc.).
-
            Q_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth )
+
            TQ_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth )
     public:
         TQAxWidget2( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 )
             : TQWidget( parent, name, f ), line_width( 1 )
@@ -128,7 +128,7 @@ the ActiveX stock events (ie. Click, KeyDown etc.).
         int line_width;
     };
 
    The control draws a circle. The line width is exposed as a property
-using the Q_PROPERTY macro.
+using the TQ_PROPERTY macro.
 
     The controls are exposed by the implementation of TQAxFactory as provided
 by the TQAXFACTORY_BEGIN and TQAXFACTORY_END macros.
 
diff --git a/doc/html/qaxserver-example-simple.html b/doc/html/qaxserver-example-simple.html
index 5a8007c62..503eb938d 100644
--- a/doc/html/qaxserver-example-simple.html
+++ b/doc/html/qaxserver-example-simple.html
@@ -47,8 +47,8 @@ and TQAxBindable::propertyChanged
 
        class TQSimpleAX : public TQWidget, public TQAxBindable
     {
         TQ_OBJECT
-        Q_PROPERTY( TQString text READ text WRITE setText )
-        Q_PROPERTY( int value READ value WRITE setValue )
+        TQ_PROPERTY( TQString text READ text WRITE setText )
+        TQ_PROPERTY( int value READ value WRITE setValue )
     public:
         TQSimpleAX( TQWidget *parent = 0, const char *name = 0 )
         : TQWidget( parent, name )
diff --git a/doc/html/qaxserver.html b/doc/html/qaxserver.html
index 84d939fe2..8ab281cb0 100644
--- a/doc/html/qaxserver.html
+++ b/doc/html/qaxserver.html
@@ -388,9 +388,9 @@ or any existing TQWidget subclass:
  
 
     The TQ_OBJECT macro is required to provide the meta object information
 about the widget to the ActiveTQt framework.
-Use the Q_PROPERTY macro to declare properties for the ActiveX control:
+Use the TQ_PROPERTY macro to declare properties for the ActiveX control:
 
     
    -        Q_PROPERTY( int value READ value WRITE setValue )
+        TQ_PROPERTY( int value READ value WRITE setValue )
     
    
  
 
     Declare a standard TQWidget constructor taking a parent widget and a name, 
@@ -593,7 +593,7 @@ slots are:
 TQPoint&
 [in, out] struct TQPoint (user defined)
 
-
     Also supported are exported enums and sets (see Q_ENUMS and Q_SETS).
+
     Also supported are exported enums and sets (see TQ_ENUMS and TQ_SETS).
 The in-parameter types are also supported as return values.
 
     Properties and signals/slots that have parameters using any other
 data types are ignored by the TQActiveX framework.
@@ -800,7 +800,7 @@ ActiveTQt. Note that some clients support only in-process controls.
 
     Microsoft Office applications are supported, but you need to register
 the controls as "Insertable" objects. Reimplement TQAxFactory::registerClass
 to add this attribute to the COM class, or set the "Insertable" class info
-for your class to "yes" using the Q_CLASSINFO macro.
+for your class to "yes" using the TQ_CLASSINFO macro.
 
     
     Unsupported Clients
 
    
 
     We have not managed to make ActiveTQt based COM objects work with the
@@ -839,7 +839,7 @@ functions and properties into its own interface.
 
 
     An alternative way to reimplementing TQAxFactory to have more control
 about how objects are registered or exposed is to provide class
-specific information using the Q_CLASSINFO macro, which is part of
+specific information using the TQ_CLASSINFO macro, which is part of
 TQt's meta object system.
 
     
    
@@ -915,14 +915,14 @@ Office applications.
     class MyActiveX : public TQWidget
     {
         TQ_OBJECT
-        Q_CLASSINFO("Version", "2.0")
-        Q_CLASSINFO("ClassID", "{7a4cffd8-cbcd-4ae9-ae7e-343e1e5710df}")
-        Q_CLASSINFO("InterfaceID", "{6fb035bf-8019-48d8-be51-ef05427d8994}")
-        Q_CLASSINFO("EventsID", "{c42fffdf-6557-47c9-817a-2da2228bc29c}")
-        Q_CLASSINFO("Insertable", "yes")
-        Q_CLASSINFO("ToSuperClass", "MyActiveX")
+        TQ_CLASSINFO("Version", "2.0")
+        TQ_CLASSINFO("ClassID", "{7a4cffd8-cbcd-4ae9-ae7e-343e1e5710df}")
+        TQ_CLASSINFO("InterfaceID", "{6fb035bf-8019-48d8-be51-ef05427d8994}")
+        TQ_CLASSINFO("EventsID", "{c42fffdf-6557-47c9-817a-2da2228bc29c}")
+        TQ_CLASSINFO("Insertable", "yes")
+        TQ_CLASSINFO("ToSuperClass", "MyActiveX")
 
-        Q_PROPERTY( ...
+        TQ_PROPERTY( ...
     public:
         MyActiveX(TQWidget *parent = 0, const char *name = 0);
 
@@ -939,14 +939,14 @@ own software.
 
     Licensing components can be done using a variety of techniques, e.g. the code
 creating the control can provide a license key, or the machine on which the
 control is supposed to run needs to be licensed.
-
     To mark a TQt class as licensed specify a "LicenseKey" using the Q_CLASSINFO
+
     To mark a TQt class as licensed specify a "LicenseKey" using the TQ_CLASSINFO
 macro.
 
     
         class MyLicensedControl : public TQWidget
     {
         TQ_OBJECT
-        Q_CLASSINFO("LicenseKey", "<key string>")
+        TQ_CLASSINFO("LicenseKey", "<key string>")
     ...
     };
     
    
diff --git a/doc/html/qbutton-h.html b/doc/html/qbutton-h.html
index f8a434604..7fb47810a 100644
--- a/doc/html/qbutton-h.html
+++ b/doc/html/qbutton-h.html
@@ -92,18 +92,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/doc/html/qbuttongroup-h.html b/doc/html/qbuttongroup-h.html
index 3d3702d50..007a33d16 100644
--- a/doc/html/qbuttongroup-h.html
+++ b/doc/html/qbuttongroup-h.html
@@ -91,9 +91,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/doc/html/qcheckbox-h.html b/doc/html/qcheckbox-h.html
index f3cb9efb9..74d2dadb6 100644
--- a/doc/html/qcheckbox-h.html
+++ b/doc/html/qcheckbox-h.html
@@ -86,9 +86,9 @@ body { background: #ffffff; color: black; }
 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/doc/html/qcombobox-h.html b/doc/html/qcombobox-h.html
index 7151e792d..d12e22b0a 100644
--- a/doc/html/qcombobox-h.html
+++ b/doc/html/qcombobox-h.html
@@ -95,18 +95,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/doc/html/qdatabrowser-h.html b/doc/html/qdatabrowser-h.html
index 4670ca930..db85474b5 100644
--- a/doc/html/qdatabrowser-h.html
+++ b/doc/html/qdatabrowser-h.html
@@ -94,16 +94,16 @@ class TQDataBrowserPrivate;
 class Q_EXPORT TQDataBrowser : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking )
-    Q_PROPERTY( TQString filter READ filter WRITE setFilter )
-    Q_PROPERTY( TQStringList sort READ sort WRITE setSort )
-    Q_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
-    Q_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
-    Q_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
-    Q_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
-    Q_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
-    Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
-    Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
+    TQ_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking )
+    TQ_PROPERTY( TQString filter READ filter WRITE setFilter )
+    TQ_PROPERTY( TQStringList sort READ sort WRITE setSort )
+    TQ_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
+    TQ_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
+    TQ_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
+    TQ_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
+    TQ_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
+    TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
+    TQ_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
 
 public:
     TQDataBrowser( TQWidget* parent=0, const char* name=0, WFlags fl = 0 );
diff --git a/doc/html/qdatatable-h.html b/doc/html/qdatatable-h.html
index 3b889883d..529bd79c2 100644
--- a/doc/html/qdatatable-h.html
+++ b/doc/html/qdatatable-h.html
@@ -104,20 +104,20 @@ class TQM_EXPORT_SQL TQDataTable : public TQTable
 {
     TQ_OBJECT
 
-    Q_PROPERTY( TQString nullText READ nullText WRITE setNullText )
-    Q_PROPERTY( TQString trueText READ trueText WRITE setTrueText )
-    Q_PROPERTY( TQString falseText READ falseText WRITE setFalseText )
-    Q_PROPERTY( DateFormat dateFormat READ dateFormat WRITE setDateFormat )
-    Q_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
-    Q_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
-    Q_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
-    Q_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
-    Q_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
-    Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
-    Q_PROPERTY( TQString filter READ filter WRITE setFilter )
-    Q_PROPERTY( TQStringList sort READ sort WRITE setSort )
-    Q_PROPERTY( int numCols READ numCols )
-    Q_PROPERTY( int numRows READ numRows )
+    TQ_PROPERTY( TQString nullText READ nullText WRITE setNullText )
+    TQ_PROPERTY( TQString trueText READ trueText WRITE setTrueText )
+    TQ_PROPERTY( TQString falseText READ falseText WRITE setFalseText )
+    TQ_PROPERTY( DateFormat dateFormat READ dateFormat WRITE setDateFormat )
+    TQ_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
+    TQ_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
+    TQ_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
+    TQ_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
+    TQ_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
+    TQ_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
+    TQ_PROPERTY( TQString filter READ filter WRITE setFilter )
+    TQ_PROPERTY( TQStringList sort READ sort WRITE setSort )
+    TQ_PROPERTY( int numCols READ numCols )
+    TQ_PROPERTY( int numRows READ numRows )
 
 public:
     TQDataTable ( TQWidget* parent=0, const char* name=0 );
diff --git a/doc/html/qdatetimeedit-h.html b/doc/html/qdatetimeedit-h.html
index 18755a3c0..b72f5ab69 100644
--- a/doc/html/qdatetimeedit-h.html
+++ b/doc/html/qdatetimeedit-h.html
@@ -113,12 +113,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 );
@@ -193,12 +193,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 {
@@ -277,7 +277,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/doc/html/qdial-h.html b/doc/html/qdial-h.html
index 72b15867d..2244359b7 100644
--- a/doc/html/qdial-h.html
+++ b/doc/html/qdial-h.html
@@ -90,16 +90,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/doc/html/qdialog-h.html b/doc/html/qdialog-h.html
index c8d6b6ead..a49649ff9 100644
--- a/doc/html/qdialog-h.html
+++ b/doc/html/qdialog-h.html
@@ -92,8 +92,8 @@ class Q_EXPORT TQDialog : public TQWidget
 {
 friend class TQPushButton;
     TQ_OBJECT
-    Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
-    Q_PROPERTY( bool modal READ isModal WRITE setModal )
+    TQ_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
+    TQ_PROPERTY( bool modal READ isModal WRITE setModal )
 
 public:
     Q_EXPLICIT TQDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
diff --git a/doc/html/qdockarea-h.html b/doc/html/qdockarea-h.html
index 56921563f..8921c786d 100644
--- a/doc/html/qdockarea-h.html
+++ b/doc/html/qdockarea-h.html
@@ -142,11 +142,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/doc/html/qdockwindow-h.html b/doc/html/qdockwindow-h.html
index 4515721d0..40b54fc16 100644
--- a/doc/html/qdockwindow-h.html
+++ b/doc/html/qdockwindow-h.html
@@ -101,17 +101,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/doc/html/qfiledialog-h.html b/doc/html/qfiledialog-h.html
index 4594e0f37..f4377df79 100644
--- a/doc/html/qfiledialog-h.html
+++ b/doc/html/qfiledialog-h.html
@@ -128,19 +128,19 @@ public:
 class Q_EXPORT TQFileDialog : public TQDialog
 {
     TQ_OBJECT
-    Q_ENUMS( Mode ViewMode PreviewMode )
+    TQ_ENUMS( Mode ViewMode PreviewMode )
     // ##### Why are this read-only properties ?
-    Q_PROPERTY( TQString selectedFile READ selectedFile )
-    Q_PROPERTY( TQString selectedFilter READ selectedFilter )
-    Q_PROPERTY( TQStringList selectedFiles READ selectedFiles )
+    TQ_PROPERTY( TQString selectedFile READ selectedFile )
+    TQ_PROPERTY( TQString selectedFilter READ selectedFilter )
+    TQ_PROPERTY( TQStringList selectedFiles READ selectedFiles )
     // #### Should not we be able to set the path ?
-    Q_PROPERTY( TQString dirPath READ dirPath )
-    Q_PROPERTY( bool showHiddenFiles READ showHiddenFiles WRITE setShowHiddenFiles )
-    Q_PROPERTY( Mode mode READ mode WRITE setMode )
-    Q_PROPERTY( ViewMode viewMode READ viewMode WRITE setViewMode )
-    Q_PROPERTY( PreviewMode previewMode READ previewMode WRITE setPreviewMode )
-    Q_PROPERTY( bool infoPreview READ isInfoPreviewEnabled WRITE setInfoPreviewEnabled )
-    Q_PROPERTY( bool contentsPreview READ isContentsPreviewEnabled WRITE setContentsPreviewEnabled )
+    TQ_PROPERTY( TQString dirPath READ dirPath )
+    TQ_PROPERTY( bool showHiddenFiles READ showHiddenFiles WRITE setShowHiddenFiles )
+    TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+    TQ_PROPERTY( ViewMode viewMode READ viewMode WRITE setViewMode )
+    TQ_PROPERTY( PreviewMode previewMode READ previewMode WRITE setPreviewMode )
+    TQ_PROPERTY( bool infoPreview READ isInfoPreviewEnabled WRITE setInfoPreviewEnabled )
+    TQ_PROPERTY( bool contentsPreview READ isContentsPreviewEnabled WRITE setContentsPreviewEnabled )
 
 public:
     TQFileDialog( const TQString& dirName, const TQString& filter = TQString::null,
diff --git a/doc/html/qframe-h.html b/doc/html/qframe-h.html
index d68edae70..d672f40b0 100644
--- a/doc/html/qframe-h.html
+++ b/doc/html/qframe-h.html
@@ -86,15 +86,15 @@ body { background: #ffffff; color: black; }
 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/doc/html/qgridview-h.html b/doc/html/qgridview-h.html
index 873710ef8..be41e1c28 100644
--- a/doc/html/qgridview-h.html
+++ b/doc/html/qgridview-h.html
@@ -88,10 +88,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/doc/html/qgroupbox-h.html b/doc/html/qgroupbox-h.html
index ad8c3c2a4..037c2ab83 100644
--- a/doc/html/qgroupbox-h.html
+++ b/doc/html/qgroupbox-h.html
@@ -93,14 +93,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/doc/html/qheader-h.html b/doc/html/qheader-h.html
index 501dde05f..7c7e7dacc 100644
--- a/doc/html/qheader-h.html
+++ b/doc/html/qheader-h.html
@@ -96,12 +96,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/doc/html/qiconview-h.html b/doc/html/qiconview-h.html
index 7e319bb6b..e2718de98 100644
--- a/doc/html/qiconview-h.html
+++ b/doc/html/qiconview-h.html
@@ -309,24 +309,24 @@ class TQM_EXPORT_ICONVIEW TQIconView : public TQScrollView
 
     TQ_OBJECT
     // #### sorting and sort direction do not work
-    Q_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode )
-    Q_PROPERTY( bool sorting READ sorting )
-    Q_PROPERTY( bool sortDirection READ sortDirection )
-    Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
-    Q_PROPERTY( int gridX READ gridX WRITE setGridX )
-    Q_PROPERTY( int gridY READ gridY WRITE setGridY )
-    Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
-    Q_PROPERTY( ItemTextPos itemTextPos READ itemTextPos WRITE setItemTextPos )
-    Q_PROPERTY( TQBrush itemTextBackground READ itemTextBackground WRITE setItemTextBackground )
-    Q_PROPERTY( Arrangement arrangement READ arrangement WRITE setArrangement )
-    Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
-    Q_PROPERTY( int maxItemWidth READ maxItemWidth WRITE setMaxItemWidth )
-    Q_PROPERTY( int maxItemTextLength READ maxItemTextLength WRITE setMaxItemTextLength )
-    Q_PROPERTY( bool autoArrange READ autoArrange WRITE setAutoArrange )
-    Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
-    Q_PROPERTY( bool wordWrapIconText READ wordWrapIconText WRITE setWordWrapIconText )
-    Q_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips )
-    Q_PROPERTY( uint count READ count )
+    TQ_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode )
+    TQ_PROPERTY( bool sorting READ sorting )
+    TQ_PROPERTY( bool sortDirection READ sortDirection )
+    TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
+    TQ_PROPERTY( int gridX READ gridX WRITE setGridX )
+    TQ_PROPERTY( int gridY READ gridY WRITE setGridY )
+    TQ_PROPERTY( int spacing READ spacing WRITE setSpacing )
+    TQ_PROPERTY( ItemTextPos itemTextPos READ itemTextPos WRITE setItemTextPos )
+    TQ_PROPERTY( TQBrush itemTextBackground READ itemTextBackground WRITE setItemTextBackground )
+    TQ_PROPERTY( Arrangement arrangement READ arrangement WRITE setArrangement )
+    TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
+    TQ_PROPERTY( int maxItemWidth READ maxItemWidth WRITE setMaxItemWidth )
+    TQ_PROPERTY( int maxItemTextLength READ maxItemTextLength WRITE setMaxItemTextLength )
+    TQ_PROPERTY( bool autoArrange READ autoArrange WRITE setAutoArrange )
+    TQ_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
+    TQ_PROPERTY( bool wordWrapIconText READ wordWrapIconText WRITE setWordWrapIconText )
+    TQ_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips )
+    TQ_PROPERTY( uint count READ count )
 
 public:
     enum SelectionMode {
diff --git a/doc/html/qlabel-h.html b/doc/html/qlabel-h.html
index 1b5429db1..0382c9675 100644
--- a/doc/html/qlabel-h.html
+++ b/doc/html/qlabel-h.html
@@ -89,13 +89,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/doc/html/qlayout-h.html b/doc/html/qlayout-h.html
index 96dbec6d1..2cf3c4f4c 100644
--- a/doc/html/qlayout-h.html
+++ b/doc/html/qlayout-h.html
@@ -215,10 +215,10 @@ private:
 class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem
 {
     TQ_OBJECT
-    Q_ENUMS( ResizeMode )
-    Q_PROPERTY( int margin READ margin WRITE setMargin )
-    Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
-    Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
+    TQ_ENUMS( ResizeMode )
+    TQ_PROPERTY( int margin READ margin WRITE setMargin )
+    TQ_PROPERTY( int spacing READ spacing WRITE setSpacing )
+    TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
 
 public:
     // ### TQt 4.0: put 'Auto' first in enum
diff --git a/doc/html/qlcdnumber-h.html b/doc/html/qlcdnumber-h.html
index 1d4bb78f1..3937bbd90 100644
--- a/doc/html/qlcdnumber-h.html
+++ b/doc/html/qlcdnumber-h.html
@@ -90,13 +90,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/doc/html/qlineedit-h.html b/doc/html/qlineedit-h.html
index b1624b355..62d8fbdff 100644
--- a/doc/html/qlineedit-h.html
+++ b/doc/html/qlineedit-h.html
@@ -95,26 +95,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/doc/html/qlistbox-h.html b/doc/html/qlistbox-h.html
index 5d2aba309..9863cbf93 100644
--- a/doc/html/qlistbox-h.html
+++ b/doc/html/qlistbox-h.html
@@ -98,20 +98,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/doc/html/qlistview-h.html b/doc/html/qlistview-h.html
index 91eb2d143..7959b5d41 100644
--- a/doc/html/qlistview-h.html
+++ b/doc/html/qlistview-h.html
@@ -277,19 +277,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/doc/html/qmainwindow-h.html b/doc/html/qmainwindow-h.html
index a7d72a8f4..676266cee 100644
--- a/doc/html/qmainwindow-h.html
+++ b/doc/html/qmainwindow-h.html
@@ -96,11 +96,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/doc/html/qmenubar-h.html b/doc/html/qmenubar-h.html
index 13917bd86..18948e42c 100644
--- a/doc/html/qmenubar-h.html
+++ b/doc/html/qmenubar-h.html
@@ -90,9 +90,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/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html
index c014327e0..43565b157 100644
--- a/doc/html/qmessagebox-h.html
+++ b/doc/html/qmessagebox-h.html
@@ -90,11 +90,11 @@ struct TQMessageBoxData;
 class Q_EXPORT TQMessageBox : public TQDialog
 {
     TQ_OBJECT
-    Q_ENUMS( Icon )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( Icon icon READ icon WRITE setIcon )
-    Q_PROPERTY( TQPixmap iconPixmap READ iconPixmap WRITE setIconPixmap )
-    Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
+    TQ_ENUMS( Icon )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( Icon icon READ icon WRITE setIcon )
+    TQ_PROPERTY( TQPixmap iconPixmap READ iconPixmap WRITE setIconPixmap )
+    TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
 
 public:
     enum Icon { NoIcon = 0, Information = 1, Warning = 2, Critical = 3,
diff --git a/doc/html/qmultilineedit-h.html b/doc/html/qmultilineedit-h.html
index 24d4973c8..f4ed57349 100644
--- a/doc/html/qmultilineedit-h.html
+++ b/doc/html/qmultilineedit-h.html
@@ -90,11 +90,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/doc/html/qobject-h.html b/doc/html/qobject-h.html
index 19ae51d9e..ebb765dfa 100644
--- a/doc/html/qobject-h.html
+++ b/doc/html/qobject-h.html
@@ -102,7 +102,7 @@ struct TQUObject;
 class Q_EXPORT TQObject: public TQt
 {
     TQ_OBJECT
-    Q_PROPERTY( TQCString name READ name WRITE setName )
+    TQ_PROPERTY( TQCString name READ name WRITE setName )
 
 public:
     TQObject( TQObject *parent=0, const char *name=0 );
diff --git a/doc/html/qpopupmenu-h.html b/doc/html/qpopupmenu-h.html
index 6d09d6177..0c7c64ffc 100644
--- a/doc/html/qpopupmenu-h.html
+++ b/doc/html/qpopupmenu-h.html
@@ -88,7 +88,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/doc/html/qprogressbar-h.html b/doc/html/qprogressbar-h.html
index a57114f81..fa4efc722 100644
--- a/doc/html/qprogressbar-h.html
+++ b/doc/html/qprogressbar-h.html
@@ -90,12 +90,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/doc/html/qprogressdialog-h.html b/doc/html/qprogressdialog-h.html
index 3b6946ebb..b18795a3c 100644
--- a/doc/html/qprogressdialog-h.html
+++ b/doc/html/qprogressdialog-h.html
@@ -92,14 +92,14 @@ class TQProgressDialogData;
 class Q_EXPORT TQProgressDialog : public TQDialog
 {
     TQ_OBJECT
-    Q_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0
-    Q_PROPERTY( bool wasCanceled READ wasCanceled )
-    Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
-    Q_PROPERTY( int progress READ progress WRITE setProgress )
-    Q_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset )
-    Q_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose )
-    Q_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration )
-    Q_PROPERTY( TQString labelText READ labelText WRITE setLabelText )
+    TQ_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0
+    TQ_PROPERTY( bool wasCanceled READ wasCanceled )
+    TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
+    TQ_PROPERTY( int progress READ progress WRITE setProgress )
+    TQ_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset )
+    TQ_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose )
+    TQ_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration )
+    TQ_PROPERTY( TQString labelText READ labelText WRITE setLabelText )
 
 public:
     TQProgressDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
diff --git a/doc/html/qpushbutton-h.html b/doc/html/qpushbutton-h.html
index e3f6c4e21..d6f2550ee 100644
--- a/doc/html/qpushbutton-h.html
+++ b/doc/html/qpushbutton-h.html
@@ -90,14 +90,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/doc/html/qradiobutton-h.html b/doc/html/qradiobutton-h.html
index 08c6ae93a..61808973c 100644
--- a/doc/html/qradiobutton-h.html
+++ b/doc/html/qradiobutton-h.html
@@ -86,8 +86,8 @@ body { background: #ffffff; color: black; }
 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/doc/html/qscrollbar-h.html b/doc/html/qscrollbar-h.html
index 6788e70d8..02bf7cec7 100644
--- a/doc/html/qscrollbar-h.html
+++ b/doc/html/qscrollbar-h.html
@@ -89,14 +89,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/doc/html/qscrollview-h.html b/doc/html/qscrollview-h.html
index 80994ca70..434897146 100644
--- a/doc/html/qscrollview-h.html
+++ b/doc/html/qscrollview-h.html
@@ -88,18 +88,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/doc/html/qslider-h.html b/doc/html/qslider-h.html
index cba21ae85..27aa31775 100644
--- a/doc/html/qslider-h.html
+++ b/doc/html/qslider-h.html
@@ -91,16 +91,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/doc/html/qspinbox-h.html b/doc/html/qspinbox-h.html
index 27dff4934..b8b9053c7 100644
--- a/doc/html/qspinbox-h.html
+++ b/doc/html/qspinbox-h.html
@@ -91,18 +91,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/doc/html/qsplitter-h.html b/doc/html/qsplitter-h.html
index 4e24851a5..8e81dbb2b 100644
--- a/doc/html/qsplitter-h.html
+++ b/doc/html/qsplitter-h.html
@@ -92,10 +92,10 @@ class TQTextStream;
 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/doc/html/qsqldatabase-h.html b/doc/html/qsqldatabase-h.html
index 7277cdddc..0df9a9860 100644
--- a/doc/html/qsqldatabase-h.html
+++ b/doc/html/qsqldatabase-h.html
@@ -114,12 +114,12 @@ public:
 class TQM_EXPORT_SQL TQSqlDatabase : public TQObject
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString databaseName  READ databaseName WRITE setDatabaseName )
-    Q_PROPERTY( TQString userName  READ userName WRITE setUserName )
-    Q_PROPERTY( TQString password  READ password WRITE setPassword )
-    Q_PROPERTY( TQString hostName  READ hostName WRITE setHostName )
-    Q_PROPERTY( int port READ port WRITE setPort )
-    Q_PROPERTY( TQString connectOptions READ connectOptions WRITE setConnectOptions )
+    TQ_PROPERTY( TQString databaseName  READ databaseName WRITE setDatabaseName )
+    TQ_PROPERTY( TQString userName  READ userName WRITE setUserName )
+    TQ_PROPERTY( TQString password  READ password WRITE setPassword )
+    TQ_PROPERTY( TQString hostName  READ hostName WRITE setHostName )
+    TQ_PROPERTY( int port READ port WRITE setPort )
+    TQ_PROPERTY( TQString connectOptions READ connectOptions WRITE setConnectOptions )
 
 public:
     ~TQSqlDatabase();
diff --git a/doc/html/qstatusbar-h.html b/doc/html/qstatusbar-h.html
index 3fa6e3327..c73341abd 100644
--- a/doc/html/qstatusbar-h.html
+++ b/doc/html/qstatusbar-h.html
@@ -90,7 +90,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/doc/html/qtabbar-h.html b/doc/html/qtabbar-h.html
index c7150d174..30892ea3a 100644
--- a/doc/html/qtabbar-h.html
+++ b/doc/html/qtabbar-h.html
@@ -124,11 +124,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/doc/html/qtable-h.html b/doc/html/qtable-h.html
index 1228d87e8..4342bfdc5 100644
--- a/doc/html/qtable-h.html
+++ b/doc/html/qtable-h.html
@@ -282,17 +282,17 @@ private:
 class TQM_EXPORT_TABLE TQTable : public TQScrollView
 {
     TQ_OBJECT
-    Q_ENUMS( SelectionMode FocusStyle )
-    Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
-    Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
-    Q_PROPERTY( bool showGrid READ showGrid WRITE setShowGrid )
-    Q_PROPERTY( bool rowMovingEnabled READ rowMovingEnabled WRITE setRowMovingEnabled )
-    Q_PROPERTY( bool columnMovingEnabled READ columnMovingEnabled WRITE setColumnMovingEnabled )
-    Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
-    Q_PROPERTY( bool sorting READ sorting WRITE setSorting )
-    Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
-    Q_PROPERTY( FocusStyle focusStyle READ focusStyle WRITE setFocusStyle )
-    Q_PROPERTY( int numSelections READ numSelections )
+    TQ_ENUMS( SelectionMode FocusStyle )
+    TQ_PROPERTY( int numRows READ numRows WRITE setNumRows )
+    TQ_PROPERTY( int numCols READ numCols WRITE setNumCols )
+    TQ_PROPERTY( bool showGrid READ showGrid WRITE setShowGrid )
+    TQ_PROPERTY( bool rowMovingEnabled READ rowMovingEnabled WRITE setRowMovingEnabled )
+    TQ_PROPERTY( bool columnMovingEnabled READ columnMovingEnabled WRITE setColumnMovingEnabled )
+    TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
+    TQ_PROPERTY( bool sorting READ sorting WRITE setSorting )
+    TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
+    TQ_PROPERTY( FocusStyle focusStyle READ focusStyle WRITE setFocusStyle )
+    TQ_PROPERTY( int numSelections READ numSelections )
 
     friend class TQTableHeader;
     friend class TQComboTableItem;
diff --git a/doc/html/qtabwidget-h.html b/doc/html/qtabwidget-h.html
index bbd8dd5b3..8b634d5e5 100644
--- a/doc/html/qtabwidget-h.html
+++ b/doc/html/qtabwidget-h.html
@@ -93,14 +93,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/doc/html/qtextbrowser-h.html b/doc/html/qtextbrowser-h.html
index 564933da5..03611096b 100644
--- a/doc/html/qtextbrowser-h.html
+++ b/doc/html/qtextbrowser-h.html
@@ -91,12 +91,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/doc/html/qtextedit-h.html b/doc/html/qtextedit-h.html
index 893798cb3..40fc37c83 100644
--- a/doc/html/qtextedit-h.html
+++ b/doc/html/qtextedit-h.html
@@ -174,27 +174,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/doc/html/qtextview-h.html b/doc/html/qtextview-h.html
index 5d0742814..2df7bb889 100644
--- a/doc/html/qtextview-h.html
+++ b/doc/html/qtextview-h.html
@@ -86,11 +86,11 @@ body { background: #ffffff; color: black; }
 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/doc/html/qtoolbar-h.html b/doc/html/qtoolbar-h.html
index f4de4dac8..30f473e08 100644
--- a/doc/html/qtoolbar-h.html
+++ b/doc/html/qtoolbar-h.html
@@ -91,7 +91,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/doc/html/qtoolbox-h.html b/doc/html/qtoolbox-h.html
index 666b6d5f1..9121717c4 100644
--- a/doc/html/qtoolbox-h.html
+++ b/doc/html/qtoolbox-h.html
@@ -90,8 +90,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/doc/html/qtoolbutton-h.html b/doc/html/qtoolbutton-h.html
index 34034bb5d..05e207ef4 100644
--- a/doc/html/qtoolbutton-h.html
+++ b/doc/html/qtoolbutton-h.html
@@ -93,22 +93,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/doc/html/qtooltip-h.html b/doc/html/qtooltip-h.html
index 6364d5fce..ea8dc6c7b 100644
--- a/doc/html/qtooltip-h.html
+++ b/doc/html/qtooltip-h.html
@@ -92,8 +92,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/doc/html/qvalidator-h.html b/doc/html/qvalidator-h.html
index ce6eb652b..d135ff869 100644
--- a/doc/html/qvalidator-h.html
+++ b/doc/html/qvalidator-h.html
@@ -109,8 +109,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 );
@@ -141,9 +141,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 );
@@ -176,7 +176,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/doc/html/qwidget-h.html b/doc/html/qwidget-h.html
index 4c6748771..d59008fe8 100644
--- a/doc/html/qwidget-h.html
+++ b/doc/html/qwidget-h.html
@@ -99,76 +99,76 @@ class TQStyle;
 class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
 {
     TQ_OBJECT
-    Q_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
-    Q_PROPERTY( bool isTopLevel READ isTopLevel )
-    Q_PROPERTY( bool isDialog READ isDialog )
-    Q_PROPERTY( bool isModal READ isModal )
-    Q_PROPERTY( bool isPopup READ isPopup )
-    Q_PROPERTY( bool isDesktop READ isDesktop )
-    Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
-    Q_PROPERTY( TQRect geometry READ geometry WRITE setGeometry )
-    Q_PROPERTY( TQRect frameGeometry READ frameGeometry )
-    Q_PROPERTY( int x READ x )
-    Q_PROPERTY( int y READ y )
-    Q_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false )
-    Q_PROPERTY( TQSize frameSize READ frameSize )
-    Q_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false )
-    Q_PROPERTY( int width READ width )
-    Q_PROPERTY( int height READ height )
-    Q_PROPERTY( TQRect rect READ rect )
-    Q_PROPERTY( TQRect childrenRect READ childrenRect )
-    Q_PROPERTY( TQRegion childrenRegion READ childrenRegion )
-    Q_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy )
-    Q_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize )
-    Q_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize )
-    Q_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false )
-    Q_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false )
-    Q_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false )
-    Q_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false )
-    Q_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement )
-    Q_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize )
-    Q_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false )
-    Q_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette )
-    Q_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette )
-    Q_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette )
-    Q_PROPERTY( TQBrush backgroundBrush READ backgroundBrush )
-    Q_PROPERTY( TQColorGroup colorGroup READ colorGroup )
-    Q_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette  STORED ownPalette )
-    Q_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin )
-    Q_PROPERTY( bool ownPalette READ ownPalette )
-    Q_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont )
-    Q_PROPERTY( bool ownFont READ ownFont )
+    TQ_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
+    TQ_PROPERTY( bool isTopLevel READ isTopLevel )
+    TQ_PROPERTY( bool isDialog READ isDialog )
+    TQ_PROPERTY( bool isModal READ isModal )
+    TQ_PROPERTY( bool isPopup READ isPopup )
+    TQ_PROPERTY( bool isDesktop READ isDesktop )
+    TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
+    TQ_PROPERTY( TQRect geometry READ geometry WRITE setGeometry )
+    TQ_PROPERTY( TQRect frameGeometry READ frameGeometry )
+    TQ_PROPERTY( int x READ x )
+    TQ_PROPERTY( int y READ y )
+    TQ_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false )
+    TQ_PROPERTY( TQSize frameSize READ frameSize )
+    TQ_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false )
+    TQ_PROPERTY( int width READ width )
+    TQ_PROPERTY( int height READ height )
+    TQ_PROPERTY( TQRect rect READ rect )
+    TQ_PROPERTY( TQRect childrenRect READ childrenRect )
+    TQ_PROPERTY( TQRegion childrenRegion READ childrenRegion )
+    TQ_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy )
+    TQ_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize )
+    TQ_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize )
+    TQ_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false )
+    TQ_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false )
+    TQ_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false )
+    TQ_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false )
+    TQ_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement )
+    TQ_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize )
+    TQ_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false )
+    TQ_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette )
+    TQ_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette )
+    TQ_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette )
+    TQ_PROPERTY( TQBrush backgroundBrush READ backgroundBrush )
+    TQ_PROPERTY( TQColorGroup colorGroup READ colorGroup )
+    TQ_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette  STORED ownPalette )
+    TQ_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin )
+    TQ_PROPERTY( bool ownPalette READ ownPalette )
+    TQ_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont )
+    TQ_PROPERTY( bool ownFont READ ownFont )
 #ifndef QT_NO_CURSOR
-    Q_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor )
-    Q_PROPERTY( bool ownCursor READ ownCursor )
+    TQ_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor )
+    TQ_PROPERTY( bool ownCursor READ ownCursor )
 #endif
 #ifndef QT_NO_WIDGET_TOPEXTRA
-    Q_PROPERTY( TQString caption READ caption WRITE setCaption )
-    Q_PROPERTY( TQPixmap icon READ icon WRITE setIcon )
-    Q_PROPERTY( TQString iconText READ iconText WRITE setIconText )
+    TQ_PROPERTY( TQString caption READ caption WRITE setCaption )
+    TQ_PROPERTY( TQPixmap icon READ icon WRITE setIcon )
+    TQ_PROPERTY( TQString iconText READ iconText WRITE setIconText )
 #endif
-    Q_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking )
-    Q_PROPERTY( bool underMouse READ hasMouse )
-    Q_PROPERTY( bool isActiveWindow READ isActiveWindow )
-    Q_PROPERTY( bool focusEnabled READ isFocusEnabled )
-    Q_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
-    Q_PROPERTY( bool focus READ hasFocus )
-    Q_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false )
-    Q_PROPERTY( bool visible READ isVisible )
-    Q_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete
-    Q_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool minimized READ isMinimized )
-    Q_PROPERTY( bool maximized READ isMaximized )
-    Q_PROPERTY( bool fullScreen READ isFullScreen )
-    Q_PROPERTY( TQSize sizeHint READ sizeHint )
-    Q_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint )
-    Q_PROPERTY( TQRect microFocusHint READ microFocusHint )
-    Q_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops )
-    Q_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool customWhatsThis READ customWhatsThis )
-    Q_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
+    TQ_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking )
+    TQ_PROPERTY( bool underMouse READ hasMouse )
+    TQ_PROPERTY( bool isActiveWindow READ isActiveWindow )
+    TQ_PROPERTY( bool focusEnabled READ isFocusEnabled )
+    TQ_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
+    TQ_PROPERTY( bool focus READ hasFocus )
+    TQ_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false )
+    TQ_PROPERTY( bool visible READ isVisible )
+    TQ_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete
+    TQ_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool minimized READ isMinimized )
+    TQ_PROPERTY( bool maximized READ isMaximized )
+    TQ_PROPERTY( bool fullScreen READ isFullScreen )
+    TQ_PROPERTY( TQSize sizeHint READ sizeHint )
+    TQ_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint )
+    TQ_PROPERTY( TQRect microFocusHint READ microFocusHint )
+    TQ_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops )
+    TQ_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool customWhatsThis READ customWhatsThis )
+    TQ_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
 
 public:
     Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0 );
diff --git a/doc/html/qwizard-h.html b/doc/html/qwizard-h.html
index f5aded811..09c902feb 100644
--- a/doc/html/qwizard-h.html
+++ b/doc/html/qwizard-h.html
@@ -90,7 +90,7 @@ class TQWizardPrivate;
 class Q_EXPORT TQWizard : public TQDialog
 {
     TQ_OBJECT
-    Q_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont )
+    TQ_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont )
 
 public:
     TQWizard( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
diff --git a/doc/html/qworkspace-h.html b/doc/html/qworkspace-h.html
index 7e08d064d..ce1ba05b8 100644
--- a/doc/html/qworkspace-h.html
+++ b/doc/html/qworkspace-h.html
@@ -99,7 +99,7 @@ class TQDockWindow;
 class TQM_EXPORT_WORKSPACE TQWorkspace : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled )
+    TQ_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled )
 
 #ifdef QT_WORKSPACE_WINDOWMODE
 public:
diff --git a/doc/html/sql-overview-custom1-main-h.html b/doc/html/sql-overview-custom1-main-h.html
index 0798283b3..7815c5fda 100644
--- a/doc/html/sql-overview-custom1-main-h.html
+++ b/doc/html/sql-overview-custom1-main-h.html
@@ -57,7 +57,7 @@ body { background: #ffffff; color: black; }
 class CustomEdit : public TQLineEdit
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
+    TQ_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
     public:
         CustomEdit( TQWidget *parent=0, const char *name=0 );
         TQString upperLine() const;
diff --git a/doc/html/sql-overview-table3-main-h.html b/doc/html/sql-overview-table3-main-h.html
index b4f2715db..d77aad816 100644
--- a/doc/html/sql-overview-table3-main-h.html
+++ b/doc/html/sql-overview-table3-main-h.html
@@ -54,7 +54,7 @@ body { background: #ffffff; color: black; }
 class StatusPicker : public TQComboBox
 {
     TQ_OBJECT
-    Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
+    TQ_PROPERTY( int statusid READ statusId WRITE setStatusId )
     public:
         StatusPicker( TQWidget *parent=0, const char *name=0 );
         int statusId() const;
diff --git a/doc/html/sql-overview-table4-main-h.html b/doc/html/sql-overview-table4-main-h.html
index 883e924e6..cc1825e70 100644
--- a/doc/html/sql-overview-table4-main-h.html
+++ b/doc/html/sql-overview-table4-main-h.html
@@ -56,7 +56,7 @@ body { background: #ffffff; color: black; }
 class StatusPicker : public TQComboBox
 {
     TQ_OBJECT
-    Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
+    TQ_PROPERTY( int statusid READ statusId WRITE setStatusId )
 public:
     StatusPicker( TQWidget *parent=0, const char *name=0 );
     int statusId() const;
diff --git a/doc/html/sql.html b/doc/html/sql.html
index 4389fe12b..fca61765d 100644
--- a/doc/html/sql.html
+++ b/doc/html/sql.html
@@ -1217,7 +1217,7 @@ we will only cover the differences here. The full source is in TQLineEdit
     {
         TQ_OBJECT
-        Q_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
+        TQ_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
         public:
             CustomEdit( TQWidget *parent=0, const char *name=0 );
             TQString upperLine() const;
@@ -1298,7 +1298,7 @@ can use a custom editor.
 
        class StatusPicker : public TQComboBox
     {
         TQ_OBJECT
-        Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
+        TQ_PROPERTY( int statusid READ statusId WRITE setStatusId )
         public:
             StatusPicker( TQWidget *parent=0, const char *name=0 );
             int statusId() const;
diff --git a/doc/man/man1/moc.1 b/doc/man/man1/moc.1
index 5e524454a..ac83e7528 100644
--- a/doc/man/man1/moc.1
+++ b/doc/man/man1/moc.1
@@ -117,8 +117,8 @@ like this:
 .nf
 class YourClass : public QObject {
     TQ_OBJECT
-    Q_PROPERTY( ... )
-    Q_CLASSINFO( ... )
+    TQ_PROPERTY( ... )
+    TQ_CLASSINFO( ... )
 
 public:
     YourClass( QObject * parent=0, const char * name=0 );
@@ -414,8 +414,8 @@ class SomeClass : public QObject {
 public:
     ...
     // illegal
-    Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-    Q_ENUMS( Priority )
+    TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+    TQ_ENUMS( Priority )
     enum Priority { High, Low, VeryHigh, VeryLow };
     void setPriority( Priority );
     Priority priority() const;
@@ -431,8 +431,8 @@ beginning of the class declaration, right after TQ_OBJECT:
 .nf
 class SomeClass : public QObject {
     TQ_OBJECT
-    Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-    Q_ENUMS( Priority )
+    TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+    TQ_ENUMS( Priority )
 public:
     ...
     enum Priority { High, Low, VeryHigh, VeryLow };
diff --git a/doc/man/man3/qaxbindable.3qt b/doc/man/man3/qaxbindable.3qt
index 919bb5126..92f69ba8a 100644
--- a/doc/man/man3/qaxbindable.3qt
+++ b/doc/man/man3/qaxbindable.3qt
@@ -58,7 +58,7 @@ The functions provided by this class allow an ActiveX control to communicate pro
 .br
         TQ_OBJECT
 .br
-        Q_PROPERTY( int value READ value WRITE setValue )
+        TQ_PROPERTY( int value READ value WRITE setValue )
 .br
     public:
 .br
diff --git a/doc/man/man3/qaxfactory.3qt b/doc/man/man3/qaxfactory.3qt
index a1538b20d..6f0392019 100644
--- a/doc/man/man3/qaxfactory.3qt
+++ b/doc/man/man3/qaxfactory.3qt
@@ -228,7 +228,7 @@ If you implement your own factory reimplement the pure virtual functions, provid
 .br
 .fi
 .PP
-If you use the \fCQ_CLASSINFO\fR macro to provide the unique identifiers or other attributes for your class you can use the QAXFACTORY_BEGIN, QAXCLASS and QAXFACTORY_END macros to expose one or more classes as COM objects.
+If you use the \fCTQ_CLASSINFO\fR macro to provide the unique identifiers or other attributes for your class you can use the QAXFACTORY_BEGIN, QAXCLASS and QAXFACTORY_END macros to expose one or more classes as COM objects.
 .PP
 .nf
 .br
@@ -268,7 +268,7 @@ Reimplement this function to return the ActiveX server's application identifier.
 .SH "QUuid QAxFactory::classID ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the class identifier for each \fIkey\fR returned by the featureList() implementation, or an empty QUuid if this factory doesn't support the value of \fIkey\fR.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "ClassID".
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "ClassID".
 .SH "QWidget * QAxFactory::create ( const QString & key, QWidget * parent = 0, const char * name = 0 )\fC [virtual]\fR"
 Reimplement this function to return a new widget for \fIkey\fR. Propagate \fIparent\fR and \fIname\fR to the QWidget constructor. Return 0 if this factory doesn't support the value of \fIkey\fR.
 .PP
@@ -288,11 +288,11 @@ The default implementation creates a generic automation wrapper based on the met
 .SH "QUuid QAxFactory::eventsID ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the identifier of the event interface for each \fIkey\fR returned by the featureList() implementation, or an empty QUuid if this factory doesn't support the value of \fIkey\fR.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "EventsID".
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "EventsID".
 .SH "QString QAxFactory::exposeToSuperClass ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the name of the super class of \fIkey\fR up to which methods and properties should be exposed by the ActiveX control.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "ToSuperClass". If no such value is set the null-string is returned, and the functions and properties of all the super classes including QWidget will be exposed.
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "ToSuperClass". If no such value is set the null-string is returned, and the functions and properties of all the super classes including QWidget will be exposed.
 .PP
 To only expose the functions and properties of the class itself, reimplement this function to return \fIkey\fR.
 .SH "QStringList QAxFactory::featureList () const\fC [pure virtual]\fR"
@@ -316,11 +316,11 @@ MouseUp
 .TP
 MouseMove
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns TRUE if the value of the Q_CLASSINFO entry "StockEvents" is "yes". Otherwise this function returns FALSE.
+The default implementation interprets \fIkey\fR as the class name, and returns TRUE if the value of the TQ_CLASSINFO entry "StockEvents" is "yes". Otherwise this function returns FALSE.
 .SH "QUuid QAxFactory::interfaceID ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the interface identifier for each \fIkey\fR returned by the featureList() implementation, or an empty QUuid if this factory doesn't support the value of \fIkey\fR.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "InterfaceID".
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "InterfaceID".
 .SH "bool QAxFactory::isServer ()\fC [static]\fR"
 Returns TRUE if the application has been started (by COM) as an ActiveX server, otherwise returns FALSE.
 .PP
@@ -405,7 +405,7 @@ See also registerClass() and QSettings.
 Reimplement this function to return TRUE if \fIlicenseKey\fR is a valid license for the class \fIkey\fR, or if the current machine is licensed.
 .PP
 The default implementation returns TRUE if the class \fIkey\fR is not
-licensed (ie. no Q_CLASSINFO attribute "LicenseKey"), or if 
+licensed (ie. no TQ_CLASSINFO attribute "LicenseKey"), or if 
 \fIlicenseKey\fR matches the value of the "LicenseKey" attribute, or
 if the machine is licensed through a .LIC file with the same filename
 as this COM server.
diff --git a/doc/man/man3/qsqlpropertymap.3qt b/doc/man/man3/qsqlpropertymap.3qt
index 03a86b3d8..3d0cbe34a 100644
--- a/doc/man/man3/qsqlpropertymap.3qt
+++ b/doc/man/man3/qsqlpropertymap.3qt
@@ -134,7 +134,7 @@ Note that if the QSqlPropertyMap is installed with installPropertyMap() the obje
 .SH "QSqlPropertyMap * QSqlPropertyMap::defaultMap ()\fC [static]\fR"
 Returns the application global QSqlPropertyMap.
 .SH "void QSqlPropertyMap::insert ( const QString & classname, const QString & property )"
-Insert a new classname/property pair, which is used for custom SQL field editors. There \fImust\fR be a \fCQ_PROPERTY\fR clause in the \fIclassname\fR class declaration for the \fIproperty\fR.
+Insert a new classname/property pair, which is used for custom SQL field editors. There \fImust\fR be a \fCTQ_PROPERTY\fR clause in the \fIclassname\fR class declaration for the \fIproperty\fR.
 .PP
 Example: sql/overview/custom1/main.cpp.
 .SH "void QSqlPropertyMap::installDefaultMap ( QSqlPropertyMap * map )\fC [static]\fR"
diff --git a/doc/moc.doc b/doc/moc.doc
index 53f36f28d..7aa23b601 100644
--- a/doc/moc.doc
+++ b/doc/moc.doc
@@ -89,8 +89,8 @@ like this:
 \endcode
 
 In addition to the signals and slots shown above, the moc also
-implements object properties as in the next example. The Q_PROPERTY
-macro declares an object property, while Q_ENUMS declares a list of
+implements object properties as in the next example. The TQ_PROPERTY
+macro declares an object property, while TQ_ENUMS declares a list of
 enumeration types within the class to be usable inside the 
 \link properties.html property system\endlink.  In this particular
 case we declare a property of the enumeration type \c Priority that is
@@ -101,8 +101,8 @@ function \c setPriority().
     class MyClass : public QObject
     {
         TQ_OBJECT
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-        Q_ENUMS( Priority )
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+        TQ_ENUMS( Priority )
     public:
         MyClass( QObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -113,17 +113,17 @@ function \c setPriority().
     };
 \endcode
 
-Properties can be modified in subclasses with the Q_OVERRIDE
-macro. The Q_SETS macro declares enums that are to be used as
-sets, i.e. OR'ed together. Another macro, Q_CLASSINFO, can be used to
+Properties can be modified in subclasses with the TQ_OVERRIDE
+macro. The TQ_SETS macro declares enums that are to be used as
+sets, i.e. OR'ed together. Another macro, TQ_CLASSINFO, can be used to
 attach additional name/value-pairs to the class' meta object:
 
 \code
     class MyClass : public QObject
     {
         TQ_OBJECT
-        Q_CLASSINFO( "Author", "Oscar Peterson")
-        Q_CLASSINFO( "Status", "Active")
+        TQ_CLASSINFO( "Author", "Oscar Peterson")
+        TQ_CLASSINFO( "Status", "Active")
     public:
         MyClass( QObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -484,8 +484,8 @@ illegal syntax:
         TQ_OBJECT
     public:
 	...
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority ) // WRONG
-        Q_ENUMS( Priority ) // WRONG
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority ) // WRONG
+        TQ_ENUMS( Priority ) // WRONG
         enum Priority { High, Low, VeryHigh, VeryLow };
         void setPriority( Priority );
         Priority priority() const;
@@ -499,8 +499,8 @@ beginning of the class declaration, right after TQ_OBJECT:
 \code
     class SomeClass : public QObject {
         TQ_OBJECT
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-        Q_ENUMS( Priority )
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+        TQ_ENUMS( Priority )
     public:
 	...
         enum Priority { High, Low, VeryHigh, VeryLow };
diff --git a/doc/object.doc b/doc/object.doc
index cd8ffb279..b5d6180cb 100644
--- a/doc/object.doc
+++ b/doc/object.doc
@@ -223,11 +223,11 @@ features like \c __property or \c [property]. Our solution works with
 on the meta-object system that also provides object communication
 through \link signalsandslots.html signals and slots\endlink.
 
-The \c Q_PROPERTY macro in a class declaration declares a
+The \c TQ_PROPERTY macro in a class declaration declares a
 property. Properties can only be declared in classes that inherit \l
-QObject. A second macro, \c Q_OVERRIDE, can be used to override some
+QObject. A second macro, \c TQ_OVERRIDE, can be used to override some
 aspects of an inherited property in a subclass. (See \link #override
-Q_OVERRIDE\endlink.)
+TQ_OVERRIDE\endlink.)
 
 To the outer world, a property appears to be similar to a data member.
 But properties have several features that distinguish them from
@@ -303,10 +303,10 @@ functions in use:
 
 The class has a property "priority" that is not yet known to the meta
 object system. In order to make the property known, you must
-declare it with the \c Q_PROPERTY macro. The syntax is as follows:
+declare it with the \c TQ_PROPERTY macro. The syntax is as follows:
 
 \code
-Q_PROPERTY( type name READ getFunction [WRITE setFunction]
+TQ_PROPERTY( type name READ getFunction [WRITE setFunction]
             [RESET resetFunction] [DESIGNABLE bool] 
             [SCRIPTABLE bool] [STORED bool] )
 \endcode
@@ -335,15 +335,15 @@ It is possible to set a value by name, like this:
 In the case of \c QValueList and \c QMap properties the value passes
 is a QVariant whose value is the entire list or map.
 
-Enumeration types are registered with the \c Q_ENUMS macro. Here's the
+Enumeration types are registered with the \c TQ_ENUMS macro. Here's the
 final class declaration including the property related declarations:
 
 \code
     class MyClass : public QObject
     {
         TQ_OBJECT
-        Q_PROPERTY( Priority priority READ priority WRITE setPriority )
-        Q_ENUMS( Priority )
+        TQ_PROPERTY( Priority priority READ priority WRITE setPriority )
+        TQ_ENUMS( Priority )
     public:
         MyClass( QObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -354,13 +354,13 @@ final class declaration including the property related declarations:
     };
 \endcode
 
-Another similar macro is \c Q_SETS. Like \c Q_ENUMS, it registers an
+Another similar macro is \c TQ_SETS. Like \c TQ_ENUMS, it registers an
 enumeration type but marks it in addition as a "set", i.e. the
 enumeration values can be OR-ed together. An I/O class might have
 enumeration values "Read" and "Write" and accept "Read|Write": such an
-enum is best handled with \c Q_SETS, rather than \c Q_ENUMS.
+enum is best handled with \c TQ_SETS, rather than \c TQ_ENUMS.
 
-The remaining keywords in the \c Q_PROPERTY section are \c RESET, \c
+The remaining keywords in the \c TQ_PROPERTY section are \c RESET, \c
 DESIGNABLE, \c SCRIPTABLE and \c STORED.
 
 \c RESET names a function that will set the property to its default
@@ -383,19 +383,19 @@ properties (like QPoint pos if QRect geometry is already a property)
 define this to be \c FALSE.
 
 
-Connected to the property system is an additional macro, "Q_CLASSINFO",
+Connected to the property system is an additional macro, "TQ_CLASSINFO",
 that can be used to attach additional name/value-pairs to a class'
 meta object, for example:
 
 \code
-    Q_CLASSINFO( "Version", "3.0.0" )
+    TQ_CLASSINFO( "Version", "3.0.0" )
 \endcode
 
 Like other meta data, class information is accessible at runtime
 through the meta object, see \l QMetaObject::classInfo() for details.
 
 \target override
-\section1 Q_OVERRIDE
+\section1 TQ_OVERRIDE
 
 When you inherit a QObject subclass you may wish to override some
 aspects of some of the class's properties.
@@ -403,7 +403,7 @@ aspects of some of the class's properties.
 For example, in QWidget we have the autoMask property defined like
 this:
 \code
-    Q_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
 \endcode
 
 But we need to make the auto mask property designable in some QWidget
@@ -412,20 +412,20 @@ scriptable (e.g. for QSA). This is achieved by overriding these
 features of the property in a subclass. In QCheckBox, for example, we
 achieve this using the following code:
 \code
-    Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
+    TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 \endcode
 
 Another example is QToolButton. By default QToolButton has a read-only
 "toggleButton" property, because that's what it inherits from QButton:
 \code
-    Q_PROPERTY( bool toggleButton READ isToggleButton )
+    TQ_PROPERTY( bool toggleButton READ isToggleButton )
 \endcode
 
 But we want to make our tool buttons able to be toggled, so we write a
 WRITE function in QToolButton, and use the following property override
 to make it acessible:
 \code
-    Q_OVERRIDE( bool toggleButton WRITE setToggleButton )
+    TQ_OVERRIDE( bool toggleButton WRITE setToggleButton )
 \endcode
 The result is read-write (and scriptable and designable, since we now
 have a WRITE function) boolean property "toggleButton" for tool
diff --git a/examples/demo/dnd/styledbutton.h b/examples/demo/dnd/styledbutton.h
index 2cd6c0ae6..80fae5c10 100644
--- a/examples/demo/dnd/styledbutton.h
+++ b/examples/demo/dnd/styledbutton.h
@@ -44,12 +44,12 @@ class StyledButton : public TQButton
 {
     TQ_OBJECT
 
-    Q_PROPERTY( TQColor color READ color WRITE setColor )
-    Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
-    Q_PROPERTY( EditorType editor READ editor WRITE setEditor )
-    Q_PROPERTY( bool scale READ scale WRITE setScale )
+    TQ_PROPERTY( TQColor color READ color WRITE setColor )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+    TQ_PROPERTY( EditorType editor READ editor WRITE setEditor )
+    TQ_PROPERTY( bool scale READ scale WRITE setScale )
 
-    Q_ENUMS( EditorType )
+    TQ_ENUMS( EditorType )
 
 public:
     enum EditorType { ColorEditor, PixmapEditor };
diff --git a/examples/sql/overview/custom1/main.h b/examples/sql/overview/custom1/main.h
index 7ee9d5ddc..6ba30e28c 100644
--- a/examples/sql/overview/custom1/main.h
+++ b/examples/sql/overview/custom1/main.h
@@ -22,7 +22,7 @@
 class CustomEdit : public TQLineEdit
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
+    TQ_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
     public:
 	CustomEdit( TQWidget *parent=0, const char *name=0 );
 	TQString upperLine() const;
diff --git a/examples/sql/overview/table3/main.h b/examples/sql/overview/table3/main.h
index 8720dbb6f..4b10d7e17 100644
--- a/examples/sql/overview/table3/main.h
+++ b/examples/sql/overview/table3/main.h
@@ -19,7 +19,7 @@
 class StatusPicker : public TQComboBox
 {
     TQ_OBJECT
-    Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
+    TQ_PROPERTY( int statusid READ statusId WRITE setStatusId )
     public:
 	StatusPicker( TQWidget *parent=0, const char *name=0 );
 	int statusId() const;
diff --git a/examples/sql/overview/table4/main.h b/examples/sql/overview/table4/main.h
index 184d69777..394d34738 100644
--- a/examples/sql/overview/table4/main.h
+++ b/examples/sql/overview/table4/main.h
@@ -21,7 +21,7 @@
 class StatusPicker : public TQComboBox
 {
     TQ_OBJECT
-    Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
+    TQ_PROPERTY( int statusid READ statusId WRITE setStatusId )
 public:
     StatusPicker( TQWidget *parent=0, const char *name=0 );
     int statusId() const;
diff --git a/src/attic/qtmultilineedit.h b/src/attic/qtmultilineedit.h
index f74b66ef1..da12cb543 100644
--- a/src/attic/qtmultilineedit.h
+++ b/src/attic/qtmultilineedit.h
@@ -29,27 +29,27 @@ class TQValidator;
 class TQtMultiLineEdit : public TQtTableView
 {
     TQ_OBJECT
-    Q_ENUMS( EchoMode WordWrap WrapPolicy )
-    Q_PROPERTY( int numLines READ numLines )
-    Q_PROPERTY( bool atBeginning READ atBeginning )
-    Q_PROPERTY( bool atEnd READ atEnd )
-    Q_PROPERTY( int maxLineWidth READ maxLineWidth )
-    Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
-    Q_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false )
-    Q_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode )
-    Q_PROPERTY( int maxLength READ maxLength WRITE setMaxLength )
-    Q_PROPERTY( int maxLines READ maxLines WRITE setMaxLines )
-    Q_PROPERTY( int hMargin READ hMargin WRITE setHMargin )
-    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 autoUpdate READ autoUpdate WRITE setAutoUpdate DESIGNABLE false )
-    Q_PROPERTY( bool undoEnabled READ isUndoEnabled WRITE setUndoEnabled )
-    Q_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth )
-    Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
-    Q_PROPERTY( bool overWriteMode READ isOverwriteMode WRITE setOverwriteMode )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( int length READ length )
+    TQ_ENUMS( EchoMode WordWrap WrapPolicy )
+    TQ_PROPERTY( int numLines READ numLines )
+    TQ_PROPERTY( bool atBeginning READ atBeginning )
+    TQ_PROPERTY( bool atEnd READ atEnd )
+    TQ_PROPERTY( int maxLineWidth READ maxLineWidth )
+    TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
+    TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false )
+    TQ_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode )
+    TQ_PROPERTY( int maxLength READ maxLength WRITE setMaxLength )
+    TQ_PROPERTY( int maxLines READ maxLines WRITE setMaxLines )
+    TQ_PROPERTY( int hMargin READ hMargin WRITE setHMargin )
+    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 autoUpdate READ autoUpdate WRITE setAutoUpdate DESIGNABLE false )
+    TQ_PROPERTY( bool undoEnabled READ isUndoEnabled WRITE setUndoEnabled )
+    TQ_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth )
+    TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
+    TQ_PROPERTY( bool overWriteMode READ isOverwriteMode WRITE setOverwriteMode )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( int length READ length )
 
 public:
     TQtMultiLineEdit( TQWidget *parent=0, const char *name=0 );
diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h
index 113703d6f..5c9e1499f 100644
--- a/src/dialogs/ntqdialog.h
+++ b/src/dialogs/ntqdialog.h
@@ -56,8 +56,8 @@ class Q_EXPORT TQDialog : public TQWidget
 {
 friend class TQPushButton;
     TQ_OBJECT
-    Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
-    Q_PROPERTY( bool modal READ isModal WRITE setModal )
+    TQ_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
+    TQ_PROPERTY( bool modal READ isModal WRITE setModal )
 
 public:
     Q_EXPLICIT TQDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/ntqfiledialog.h
index aeaee742a..577958bc5 100644
--- a/src/dialogs/ntqfiledialog.h
+++ b/src/dialogs/ntqfiledialog.h
@@ -92,19 +92,19 @@ public:
 class Q_EXPORT TQFileDialog : public TQDialog
 {
     TQ_OBJECT
-    Q_ENUMS( Mode ViewMode PreviewMode )
+    TQ_ENUMS( Mode ViewMode PreviewMode )
     // ##### Why are this read-only properties ?
-    Q_PROPERTY( TQString selectedFile READ selectedFile )
-    Q_PROPERTY( TQString selectedFilter READ selectedFilter )
-    Q_PROPERTY( TQStringList selectedFiles READ selectedFiles )
+    TQ_PROPERTY( TQString selectedFile READ selectedFile )
+    TQ_PROPERTY( TQString selectedFilter READ selectedFilter )
+    TQ_PROPERTY( TQStringList selectedFiles READ selectedFiles )
     // #### Should not we be able to set the path ?
-    Q_PROPERTY( TQString dirPath READ dirPath )
-    Q_PROPERTY( bool showHiddenFiles READ showHiddenFiles WRITE setShowHiddenFiles )
-    Q_PROPERTY( Mode mode READ mode WRITE setMode )
-    Q_PROPERTY( ViewMode viewMode READ viewMode WRITE setViewMode )
-    Q_PROPERTY( PreviewMode previewMode READ previewMode WRITE setPreviewMode )
-    Q_PROPERTY( bool infoPreview READ isInfoPreviewEnabled WRITE setInfoPreviewEnabled )
-    Q_PROPERTY( bool contentsPreview READ isContentsPreviewEnabled WRITE setContentsPreviewEnabled )
+    TQ_PROPERTY( TQString dirPath READ dirPath )
+    TQ_PROPERTY( bool showHiddenFiles READ showHiddenFiles WRITE setShowHiddenFiles )
+    TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+    TQ_PROPERTY( ViewMode viewMode READ viewMode WRITE setViewMode )
+    TQ_PROPERTY( PreviewMode previewMode READ previewMode WRITE setPreviewMode )
+    TQ_PROPERTY( bool infoPreview READ isInfoPreviewEnabled WRITE setInfoPreviewEnabled )
+    TQ_PROPERTY( bool contentsPreview READ isContentsPreviewEnabled WRITE setContentsPreviewEnabled )
 
 public:
     TQFileDialog( const TQString& dirName, const TQString& filter = TQString::null,
diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h
index 50522e813..c4436dfc4 100644
--- a/src/dialogs/ntqmessagebox.h
+++ b/src/dialogs/ntqmessagebox.h
@@ -54,11 +54,11 @@ struct TQMessageBoxData;
 class Q_EXPORT TQMessageBox : public TQDialog
 {
     TQ_OBJECT
-    Q_ENUMS( Icon )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( Icon icon READ icon WRITE setIcon )
-    Q_PROPERTY( TQPixmap iconPixmap READ iconPixmap WRITE setIconPixmap )
-    Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
+    TQ_ENUMS( Icon )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( Icon icon READ icon WRITE setIcon )
+    TQ_PROPERTY( TQPixmap iconPixmap READ iconPixmap WRITE setIconPixmap )
+    TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
 
 public:
     enum Icon { NoIcon = 0, Information = 1, Warning = 2, Critical = 3,
diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h
index 77b8af109..404fa5e3d 100644
--- a/src/dialogs/ntqprogressdialog.h
+++ b/src/dialogs/ntqprogressdialog.h
@@ -56,14 +56,14 @@ class TQProgressDialogData;
 class Q_EXPORT TQProgressDialog : public TQDialog
 {
     TQ_OBJECT
-    Q_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0
-    Q_PROPERTY( bool wasCanceled READ wasCanceled )
-    Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
-    Q_PROPERTY( int progress READ progress WRITE setProgress )
-    Q_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset )
-    Q_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose )
-    Q_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration )
-    Q_PROPERTY( TQString labelText READ labelText WRITE setLabelText )
+    TQ_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0
+    TQ_PROPERTY( bool wasCanceled READ wasCanceled )
+    TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
+    TQ_PROPERTY( int progress READ progress WRITE setProgress )
+    TQ_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset )
+    TQ_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose )
+    TQ_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration )
+    TQ_PROPERTY( TQString labelText READ labelText WRITE setLabelText )
 
 public:
     TQProgressDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/ntqwizard.h
index d0c90b384..d9fb8d1cc 100644
--- a/src/dialogs/ntqwizard.h
+++ b/src/dialogs/ntqwizard.h
@@ -54,7 +54,7 @@ class TQWizardPrivate;
 class Q_EXPORT TQWizard : public TQDialog
 {
     TQ_OBJECT
-    Q_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont )
+    TQ_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont )
 
 public:
     TQWizard( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index a4863f868..7efb55ff6 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -74,8 +74,8 @@ struct TQWellArrayData;
 class TQWellArray : public TQGridView
 {
     TQ_OBJECT
-    Q_PROPERTY( int selectedColumn READ selectedColumn )
-    Q_PROPERTY( int selectedRow READ selectedRow )
+    TQ_PROPERTY( int selectedColumn READ selectedColumn )
+    TQ_PROPERTY( int selectedRow READ selectedRow )
 
 public:
     TQWellArray( TQWidget* parent=0, const char* name=0, bool popup = FALSE );
diff --git a/src/iconview/ntqiconview.h b/src/iconview/ntqiconview.h
index 6df2991f7..bda8273f4 100644
--- a/src/iconview/ntqiconview.h
+++ b/src/iconview/ntqiconview.h
@@ -277,24 +277,24 @@ class TQM_EXPORT_ICONVIEW TQIconView : public TQScrollView
 
     TQ_OBJECT
     // #### sorting and sort direction do not work
-    Q_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode )
-    Q_PROPERTY( bool sorting READ sorting )
-    Q_PROPERTY( bool sortDirection READ sortDirection )
-    Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
-    Q_PROPERTY( int gridX READ gridX WRITE setGridX )
-    Q_PROPERTY( int gridY READ gridY WRITE setGridY )
-    Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
-    Q_PROPERTY( ItemTextPos itemTextPos READ itemTextPos WRITE setItemTextPos )
-    Q_PROPERTY( TQBrush itemTextBackground READ itemTextBackground WRITE setItemTextBackground )
-    Q_PROPERTY( Arrangement arrangement READ arrangement WRITE setArrangement )
-    Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
-    Q_PROPERTY( int maxItemWidth READ maxItemWidth WRITE setMaxItemWidth )
-    Q_PROPERTY( int maxItemTextLength READ maxItemTextLength WRITE setMaxItemTextLength )
-    Q_PROPERTY( bool autoArrange READ autoArrange WRITE setAutoArrange )
-    Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
-    Q_PROPERTY( bool wordWrapIconText READ wordWrapIconText WRITE setWordWrapIconText )
-    Q_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips )
-    Q_PROPERTY( uint count READ count )
+    TQ_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode )
+    TQ_PROPERTY( bool sorting READ sorting )
+    TQ_PROPERTY( bool sortDirection READ sortDirection )
+    TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
+    TQ_PROPERTY( int gridX READ gridX WRITE setGridX )
+    TQ_PROPERTY( int gridY READ gridY WRITE setGridY )
+    TQ_PROPERTY( int spacing READ spacing WRITE setSpacing )
+    TQ_PROPERTY( ItemTextPos itemTextPos READ itemTextPos WRITE setItemTextPos )
+    TQ_PROPERTY( TQBrush itemTextBackground READ itemTextBackground WRITE setItemTextBackground )
+    TQ_PROPERTY( Arrangement arrangement READ arrangement WRITE setArrangement )
+    TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
+    TQ_PROPERTY( int maxItemWidth READ maxItemWidth WRITE setMaxItemWidth )
+    TQ_PROPERTY( int maxItemTextLength READ maxItemTextLength WRITE setMaxItemTextLength )
+    TQ_PROPERTY( bool autoArrange READ autoArrange WRITE setAutoArrange )
+    TQ_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
+    TQ_PROPERTY( bool wordWrapIconText READ wordWrapIconText WRITE setWordWrapIconText )
+    TQ_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips )
+    TQ_PROPERTY( uint count READ count )
 
 public:
     enum SelectionMode {
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index 2405a7f15..ce170abc2 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -179,10 +179,10 @@ private:
 class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem
 {
     TQ_OBJECT
-    Q_ENUMS( ResizeMode )
-    Q_PROPERTY( int margin READ margin WRITE setMargin )
-    Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
-    Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
+    TQ_ENUMS( ResizeMode )
+    TQ_PROPERTY( int margin READ margin WRITE setMargin )
+    TQ_PROPERTY( int spacing READ spacing WRITE setSpacing )
+    TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
 
 public:
     // ### TQt 4.0: put 'Auto' first in enum
diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h
index dc4ef21a0..5b64e2d01 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/ntqobject.h
@@ -66,7 +66,7 @@ struct TQUObject;
 class Q_EXPORT TQObject: public TQt
 {
     TQ_OBJECT
-    Q_PROPERTY( TQCString name READ name WRITE setName )
+    TQ_PROPERTY( TQCString name READ name WRITE setName )
 
 public:
     TQObject( TQObject *parent=0, const char *name=0 );
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index 4d4e794fa..11401308b 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -77,11 +77,11 @@ struct TQUObject;
 #ifdef QT_MOC_CPP
 #define slots			    slots
 #define signals		    signals
-#define Q_CLASSINFO( name, value ) Q_CLASSINFO( name, value )
-#define Q_PROPERTY( text )	    Q_PROPERTY( text )
-#define Q_OVERRIDE( text )	    Q_OVERRIDE( text )
-#define Q_ENUMS( x )		    Q_ENUMS( x )
-#define Q_SETS( x )		    Q_SETS( x )
+#define TQ_CLASSINFO( name, value ) TQ_CLASSINFO( name, value )
+#define TQ_PROPERTY( text )	    TQ_PROPERTY( text )
+#define TQ_OVERRIDE( text )	    TQ_OVERRIDE( text )
+#define TQ_ENUMS( x )		    TQ_ENUMS( x )
+#define TQ_SETS( x )		    TQ_SETS( x )
  /* tmake ignore TQ_OBJECT */
 #define TQ_OBJECT		    TQ_OBJECT
  /* tmake ignore TQ_OBJECT */
@@ -93,11 +93,11 @@ struct TQUObject;
 #ifndef QT_NO_EMIT
 #define emit					// emit signal
 #endif
-#define Q_CLASSINFO( name, value )		// class info
-#define Q_PROPERTY( text )			// property
-#define Q_OVERRIDE( text )			// override property
-#define Q_ENUMS( x )
-#define Q_SETS( x )
+#define TQ_CLASSINFO( name, value )		// class info
+#define TQ_PROPERTY( text )			// property
+#define TQ_OVERRIDE( text )			// override property
+#define TQ_ENUMS( x )
+#define TQ_SETS( x )
 
 /* tmake ignore TQ_OBJECT */
 #define TQ_OBJECT							\
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index c4a288d4b..d7c8cb583 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -67,76 +67,76 @@ class TQStyle;
 class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
 {
     TQ_OBJECT
-    Q_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
-    Q_PROPERTY( bool isTopLevel READ isTopLevel )
-    Q_PROPERTY( bool isDialog READ isDialog )
-    Q_PROPERTY( bool isModal READ isModal )
-    Q_PROPERTY( bool isPopup READ isPopup )
-    Q_PROPERTY( bool isDesktop READ isDesktop )
-    Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
-    Q_PROPERTY( TQRect geometry READ geometry WRITE setGeometry )
-    Q_PROPERTY( TQRect frameGeometry READ frameGeometry )
-    Q_PROPERTY( int x READ x )
-    Q_PROPERTY( int y READ y )
-    Q_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false )
-    Q_PROPERTY( TQSize frameSize READ frameSize )
-    Q_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false )
-    Q_PROPERTY( int width READ width )
-    Q_PROPERTY( int height READ height )
-    Q_PROPERTY( TQRect rect READ rect )
-    Q_PROPERTY( TQRect childrenRect READ childrenRect )
-    Q_PROPERTY( TQRegion childrenRegion READ childrenRegion )
-    Q_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy )
-    Q_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize )
-    Q_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize )
-    Q_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false )
-    Q_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false )
-    Q_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false )
-    Q_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false )
-    Q_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement )
-    Q_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize )
-    Q_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false )
-    Q_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette )
-    Q_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette )
-    Q_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette )
-    Q_PROPERTY( TQBrush backgroundBrush READ backgroundBrush )
-    Q_PROPERTY( TQColorGroup colorGroup READ colorGroup )
-    Q_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette  STORED ownPalette )
-    Q_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin )
-    Q_PROPERTY( bool ownPalette READ ownPalette )
-    Q_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont )
-    Q_PROPERTY( bool ownFont READ ownFont )
+    TQ_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
+    TQ_PROPERTY( bool isTopLevel READ isTopLevel )
+    TQ_PROPERTY( bool isDialog READ isDialog )
+    TQ_PROPERTY( bool isModal READ isModal )
+    TQ_PROPERTY( bool isPopup READ isPopup )
+    TQ_PROPERTY( bool isDesktop READ isDesktop )
+    TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
+    TQ_PROPERTY( TQRect geometry READ geometry WRITE setGeometry )
+    TQ_PROPERTY( TQRect frameGeometry READ frameGeometry )
+    TQ_PROPERTY( int x READ x )
+    TQ_PROPERTY( int y READ y )
+    TQ_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false )
+    TQ_PROPERTY( TQSize frameSize READ frameSize )
+    TQ_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false )
+    TQ_PROPERTY( int width READ width )
+    TQ_PROPERTY( int height READ height )
+    TQ_PROPERTY( TQRect rect READ rect )
+    TQ_PROPERTY( TQRect childrenRect READ childrenRect )
+    TQ_PROPERTY( TQRegion childrenRegion READ childrenRegion )
+    TQ_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy )
+    TQ_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize )
+    TQ_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize )
+    TQ_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false )
+    TQ_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false )
+    TQ_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false )
+    TQ_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false )
+    TQ_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement )
+    TQ_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize )
+    TQ_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false )
+    TQ_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette )
+    TQ_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette )
+    TQ_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette )
+    TQ_PROPERTY( TQBrush backgroundBrush READ backgroundBrush )
+    TQ_PROPERTY( TQColorGroup colorGroup READ colorGroup )
+    TQ_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette  STORED ownPalette )
+    TQ_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin )
+    TQ_PROPERTY( bool ownPalette READ ownPalette )
+    TQ_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont )
+    TQ_PROPERTY( bool ownFont READ ownFont )
 #ifndef QT_NO_CURSOR
-    Q_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor )
-    Q_PROPERTY( bool ownCursor READ ownCursor )
+    TQ_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor )
+    TQ_PROPERTY( bool ownCursor READ ownCursor )
 #endif
 #ifndef QT_NO_WIDGET_TOPEXTRA
-    Q_PROPERTY( TQString caption READ caption WRITE setCaption )
-    Q_PROPERTY( TQPixmap icon READ icon WRITE setIcon )
-    Q_PROPERTY( TQString iconText READ iconText WRITE setIconText )
+    TQ_PROPERTY( TQString caption READ caption WRITE setCaption )
+    TQ_PROPERTY( TQPixmap icon READ icon WRITE setIcon )
+    TQ_PROPERTY( TQString iconText READ iconText WRITE setIconText )
 #endif
-    Q_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking )
-    Q_PROPERTY( bool underMouse READ hasMouse )
-    Q_PROPERTY( bool isActiveWindow READ isActiveWindow )
-    Q_PROPERTY( bool focusEnabled READ isFocusEnabled )
-    Q_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
-    Q_PROPERTY( bool focus READ hasFocus )
-    Q_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false )
-    Q_PROPERTY( bool visible READ isVisible )
-    Q_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete
-    Q_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool minimized READ isMinimized )
-    Q_PROPERTY( bool maximized READ isMaximized )
-    Q_PROPERTY( bool fullScreen READ isFullScreen )
-    Q_PROPERTY( TQSize sizeHint READ sizeHint )
-    Q_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint )
-    Q_PROPERTY( TQRect microFocusHint READ microFocusHint )
-    Q_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops )
-    Q_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool customWhatsThis READ customWhatsThis )
-    Q_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
+    TQ_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking )
+    TQ_PROPERTY( bool underMouse READ hasMouse )
+    TQ_PROPERTY( bool isActiveWindow READ isActiveWindow )
+    TQ_PROPERTY( bool focusEnabled READ isFocusEnabled )
+    TQ_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
+    TQ_PROPERTY( bool focus READ hasFocus )
+    TQ_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false )
+    TQ_PROPERTY( bool visible READ isVisible )
+    TQ_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete
+    TQ_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool minimized READ isMinimized )
+    TQ_PROPERTY( bool maximized READ isMaximized )
+    TQ_PROPERTY( bool fullScreen READ isFullScreen )
+    TQ_PROPERTY( TQSize sizeHint READ sizeHint )
+    TQ_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint )
+    TQ_PROPERTY( TQRect microFocusHint READ microFocusHint )
+    TQ_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops )
+    TQ_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool customWhatsThis READ customWhatsThis )
+    TQ_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
 
 public:
     Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 );
diff --git a/src/moc/moc.l b/src/moc/moc.l
index a917b03e3..868f9c0a6 100644
--- a/src/moc/moc.l
+++ b/src/moc/moc.l
@@ -127,11 +127,11 @@ STRING		{ALMOSTSTRING}\"
 "TQ_OBJECT"		{ X; return TQ_OBJECT; }
 "signals"		{ X; return SIGNALS; }
 "slots"			{ X; return SLOTS; }
-"Q_CLASSINFO"		{ X; return Q_CLASSINFO; }
-"Q_PROPERTY"		{ X; return Q_PROPERTY; }
-"Q_OVERRIDE"		{ X; return Q_OVERRIDE; }
-"Q_ENUMS"		{ X; return Q_ENUMS; }
-"Q_SETS"		{ X; return Q_SETS; }
+"TQ_CLASSINFO"		{ X; return TQ_CLASSINFO; }
+"TQ_PROPERTY"		{ X; return TQ_PROPERTY; }
+"TQ_OVERRIDE"		{ X; return TQ_OVERRIDE; }
+"TQ_ENUMS"		{ X; return TQ_ENUMS; }
+"TQ_SETS"		{ X; return TQ_SETS; }
 
 "{"			{ fctLevel++;Y; }
 "}"			{ fctLevel--;Y;if (fctLevel==0){X;return '}';}}
@@ -143,17 +143,17 @@ STRING		{ALMOSTSTRING}\"
 "private"		{ X;if( classPLevel == 1 ) return PRIVATE; }
 "signals"		{ X;if( classPLevel == 1 ) return SIGNALS; }
 "slots"		{ X;if( classPLevel == 1 ) return SLOTS; }
-"Q_CLASSINFO"		{ X;if( classPLevel == 1 ) return Q_CLASSINFO; }
+"TQ_CLASSINFO"		{ X;if( classPLevel == 1 ) return TQ_CLASSINFO; }
 "TQ_OBJECT"		{ X;
 				  if ( classPLevel == 1 )
 				      return TQ_OBJECT;
 				  else if ( classPLevel > 1 )
 				      moc_warn( "Cannot use TQ_OBJECT in nested class." );
 				}
-"Q_PROPERTY"		{ X;if( classPLevel == 1 ) return Q_PROPERTY; }
-"Q_OVERRIDE"		{ X;if( classPLevel == 1 ) return Q_OVERRIDE; }
-"Q_ENUMS"		{ X;if( classPLevel == 1 ) return Q_ENUMS; }
-"Q_SETS"		{ X;if( classPLevel == 1 ) return Q_SETS; }
+"TQ_PROPERTY"		{ X;if( classPLevel == 1 ) return TQ_PROPERTY; }
+"TQ_OVERRIDE"		{ X;if( classPLevel == 1 ) return TQ_OVERRIDE; }
+"TQ_ENUMS"		{ X;if( classPLevel == 1 ) return TQ_ENUMS; }
+"TQ_SETS"		{ X;if( classPLevel == 1 ) return TQ_SETS; }
 
 "{"		{ namespacePLevel++;Y; }
 "}"		{ namespacePLevel--;Y;if (namespacePLevel == 0)
diff --git a/src/moc/moc.y b/src/moc/moc.y
index afbf3988d..2826274ca 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -466,7 +466,7 @@ struct Property
 	  designable( d ), scriptable( sc ), override( ov ), oredEnum( -1 )
     {
 	/*
-	  The Q_PROPERTY construct cannot contain any commas, since
+	  The TQ_PROPERTY construct cannot contain any commas, since
 	  commas separate macro arguments. We therefore expect users
 	  to type "TQMap" instead of "TQMap". For
 	  coherence, we also expect the same for
@@ -581,7 +581,7 @@ class parser_reg {
     PropList  props;				// list of all properties
     ClassInfoList	infos;				// list of all class infos
 
-// Used to store the values in the Q_PROPERTY macro
+// Used to store the values in the TQ_PROPERTY macro
     TQCString propWrite;				// set function
     TQCString propRead;				// get function
     TQCString propReset;				// reset function
@@ -590,8 +590,8 @@ class parser_reg {
     TQCString propScriptable;				// "true", "false" or function or empty if not specified
     bool propOverride;				// Wether OVERRIDE was detected
 
-    TQStrList qtEnums;				// Used to store the contents of Q_ENUMS
-    TQStrList qtSets;				// Used to store the contents of Q_SETS
+    TQStrList qtEnums;				// Used to store the contents of TQ_ENUMS
+    TQStrList qtSets;				// Used to store the contents of TQ_SETS
 
 };
 
@@ -637,9 +637,9 @@ Access subClassPerm;			// current access permission
 
 bool	   TQ_OBJECTdetected;		// TRUE if current class
 					//  contains the TQ_OBJECT macro
-bool	   Q_PROPERTYdetected;		// TRUE if current class
-					//  contains at least one Q_PROPERTY,
-					//  Q_OVERRIDE, Q_SETS or Q_ENUMS macro
+bool	   TQ_PROPERTYdetected;		// TRUE if current class
+					//  contains at least one TQ_PROPERTY,
+					//  TQ_OVERRIDE, TQ_SETS or TQ_ENUMS macro
 bool	   tmpPropOverride;		// current property override setting
 
 int	   tmpYYStart;			// Used to store the lexers current mode
@@ -747,11 +747,11 @@ extern "C" int hack_isatty( int )
 %token			SIGNALS
 %token			SLOTS
 %token			TQ_OBJECT
-%token			Q_PROPERTY
-%token			Q_OVERRIDE
-%token			Q_CLASSINFO
-%token			Q_ENUMS
-%token			Q_SETS
+%token			TQ_PROPERTY
+%token			TQ_OVERRIDE
+%token			TQ_CLASSINFO
+%token			TQ_ENUMS
+%token			TQ_SETS
 
 %token			READ
 %token			WRITE
@@ -1252,36 +1252,36 @@ obj_member_area:	  qt_access_specifier	{ BEGIN QT_DEF; }
 					   " access permission to \"private\".");
 			      TQ_OBJECTdetected = TRUE;
 			  }
-			| Q_PROPERTY { tmpYYStart = YY_START;
+			| TQ_PROPERTY { tmpYYStart = YY_START;
 				       tmpPropOverride = FALSE;
 				       BEGIN IN_PROPERTY; }
 			  '(' property ')' {
 						BEGIN tmpYYStart;
 					   }
 			  opt_property_candidates
-			| Q_OVERRIDE { tmpYYStart = YY_START;
+			| TQ_OVERRIDE { tmpYYStart = YY_START;
 				       tmpPropOverride = TRUE;
 				       BEGIN IN_PROPERTY; }
 			  '(' property ')' {
 						BEGIN tmpYYStart;
 					   }
 			  opt_property_candidates
-			| Q_CLASSINFO { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; }
+			| TQ_CLASSINFO { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; }
 			  '(' STRING ',' STRING ')'
 				  {
 				      g->infos.append( new ClassInfo( $4, $6 ) );
 				      BEGIN tmpYYStart;
 				  }
 			  opt_property_candidates
-			| Q_ENUMS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
+			| TQ_ENUMS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
 			  '(' qt_enums ')' {
-						Q_PROPERTYdetected = TRUE;
+						TQ_PROPERTYdetected = TRUE;
 						BEGIN tmpYYStart;
 					   }
 			  opt_property_candidates
-			| Q_SETS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
+			| TQ_SETS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
 			  '(' qt_sets ')' {
-						Q_PROPERTYdetected = TRUE;
+						TQ_PROPERTYdetected = TRUE;
 						BEGIN tmpYYStart;
 					   }
 			  opt_property_candidates
@@ -1290,7 +1290,7 @@ obj_member_area:	  qt_access_specifier	{ BEGIN QT_DEF; }
 slot_area:		  SIGNALS ':'	{ moc_err( "Signals cannot "
 						 "have access specifiers" ); }
 			| SLOTS	  ':' opt_slot_declarations
-			| ':'		{ if ( tmpAccess == Public && Q_PROPERTYdetected )
+			| ':'		{ if ( tmpAccess == Public && TQ_PROPERTYdetected )
 						  BEGIN QT_DEF;
 					      else
 						  BEGIN IN_CLASS;
@@ -1572,7 +1572,7 @@ property:		IDENTIFIER IDENTIFIER
 				    if ( g->propRead.isEmpty() && !g->propOverride )
 					moc_err( "A property must at least feature a read method." );
 				    checkPropertyName( $2 );
-				    Q_PROPERTYdetected = TRUE;
+				    TQ_PROPERTYdetected = TRUE;
 				    // Avoid duplicates
 				    for( TQPtrListIterator lit( g->props ); lit.current(); ++lit ) {
 					if ( lit.current()->name == $2 ) {
@@ -2019,7 +2019,7 @@ void initClass()				 // prepare for new class
     tmpAccess      = Private;
     subClassPerm       = Private;
     TQ_OBJECTdetected   = FALSE;
-    Q_PROPERTYdetected = FALSE;
+    TQ_PROPERTYdetected = FALSE;
     skipClass	       = FALSE;
     templateClass      = FALSE;
     g->slots.clear();
@@ -2555,7 +2555,7 @@ int generateProps()
 	    if ( p->getfunc == 0 ) {
 		if ( displayWarnings ) {
 
-		    // Is the type a set, that means, mentioned in Q_SETS?
+		    // Is the type a set, that means, mentioned in TQ_SETS?
 		    bool set = FALSE;
 		    for( TQPtrListIterator lit( g->enums ); lit.current(); ++lit )
 			if ( lit.current()->name == p->type && lit.current()->set )
@@ -2671,7 +2671,7 @@ int generateProps()
 	    if ( p->setfunc == 0 ) {
 		if ( displayWarnings ) {
 
-		    // Is the type a set, that means, mentioned in Q_SETS ?
+		    // Is the type a set, that means, mentioned in TQ_SETS ?
 		    bool set = FALSE;
 		    for( TQPtrListIterator lit( g->enums ); lit.current(); ++lit )
 			if ( lit.current()->name == p->type && lit.current()->set )
@@ -3544,7 +3544,7 @@ void addEnum()
 	}
     }
 
-    // Only look at types mentioned  in Q_ENUMS and Q_SETS
+    // Only look at types mentioned  in TQ_ENUMS and TQ_SETS
     if ( g->qtEnums.contains( tmpEnum->name ) || g->qtSets.contains( tmpEnum->name ) )
     {
 	g->enums.append( tmpEnum );
diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp
index 149489d07..5b76dd4ff 100644
--- a/src/moc/moc_lex.cpp
+++ b/src/moc/moc_lex.cpp
@@ -1388,27 +1388,27 @@ YY_RULE_SETUP
 case 8:
 YY_RULE_SETUP
 #line 130 "moc.l"
-{ X; return Q_CLASSINFO; }
+{ X; return TQ_CLASSINFO; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
 #line 131 "moc.l"
-{ X; return Q_PROPERTY; }
+{ X; return TQ_PROPERTY; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
 #line 132 "moc.l"
-{ X; return Q_OVERRIDE; }
+{ X; return TQ_OVERRIDE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
 #line 133 "moc.l"
-{ X; return Q_ENUMS; }
+{ X; return TQ_ENUMS; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
 #line 134 "moc.l"
-{ X; return Q_SETS; }
+{ X; return TQ_SETS; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
@@ -1459,7 +1459,7 @@ YY_RULE_SETUP
 case 22:
 YY_RULE_SETUP
 #line 146 "moc.l"
-{ X;if( classPLevel == 1 ) return Q_CLASSINFO; }
+{ X;if( classPLevel == 1 ) return TQ_CLASSINFO; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
@@ -1474,22 +1474,22 @@ YY_RULE_SETUP
 case 24:
 YY_RULE_SETUP
 #line 153 "moc.l"
-{ X;if( classPLevel == 1 ) return Q_PROPERTY; }
+{ X;if( classPLevel == 1 ) return TQ_PROPERTY; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 154 "moc.l"
-{ X;if( classPLevel == 1 ) return Q_OVERRIDE; }
+{ X;if( classPLevel == 1 ) return TQ_OVERRIDE; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 155 "moc.l"
-{ X;if( classPLevel == 1 ) return Q_ENUMS; }
+{ X;if( classPLevel == 1 ) return TQ_ENUMS; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 156 "moc.l"
-{ X;if( classPLevel == 1 ) return Q_SETS; }
+{ X;if( classPLevel == 1 ) return TQ_SETS; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index 46a5cfe28..57ee1e861 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -481,7 +481,7 @@ struct Property
 	  designable( d ), scriptable( sc ), override( ov ), oredEnum( -1 )
     {
 	/*
-	  The Q_PROPERTY construct cannot contain any commas, since
+	  The TQ_PROPERTY construct cannot contain any commas, since
 	  commas separate macro arguments. We therefore expect users
 	  to type "TQMap" instead of "TQMap". For
 	  coherence, we also expect the same for
@@ -596,7 +596,7 @@ class parser_reg {
     PropList  props;				// list of all properties
     ClassInfoList	infos;				// list of all class infos
 
-// Used to store the values in the Q_PROPERTY macro
+// Used to store the values in the TQ_PROPERTY macro
     TQCString propWrite;				// set function
     TQCString propRead;				// get function
     TQCString propReset;				// reset function
@@ -605,8 +605,8 @@ class parser_reg {
     TQCString propScriptable;				// "true", "false" or function or empty if not specified
     bool propOverride;				// Wether OVERRIDE was detected
 
-    TQStrList qtEnums;				// Used to store the contents of Q_ENUMS
-    TQStrList qtSets;				// Used to store the contents of Q_SETS
+    TQStrList qtEnums;				// Used to store the contents of TQ_ENUMS
+    TQStrList qtSets;				// Used to store the contents of TQ_SETS
 
 };
 
@@ -652,9 +652,9 @@ Access subClassPerm;			// current access permission
 
 bool	   TQ_OBJECTdetected;		// TRUE if current class
 					//  contains the TQ_OBJECT macro
-bool	   Q_PROPERTYdetected;		// TRUE if current class
-					//  contains at least one Q_PROPERTY,
-					//  Q_OVERRIDE, Q_SETS or Q_ENUMS macro
+bool	   TQ_PROPERTYdetected;		// TRUE if current class
+					//  contains at least one TQ_PROPERTY,
+					//  TQ_OVERRIDE, TQ_SETS or TQ_ENUMS macro
 bool	   tmpPropOverride;		// current property override setting
 
 int	   tmpYYStart;			// Used to store the lexers current mode
@@ -772,11 +772,11 @@ extern "C" int hack_isatty( int )
      SIGNALS = 298,
      SLOTS = 299,
      TQ_OBJECT = 300,
-     Q_PROPERTY = 301,
-     Q_OVERRIDE = 302,
-     Q_CLASSINFO = 303,
-     Q_ENUMS = 304,
-     Q_SETS = 305,
+     TQ_PROPERTY = 301,
+     TQ_OVERRIDE = 302,
+     TQ_CLASSINFO = 303,
+     TQ_ENUMS = 304,
+     TQ_SETS = 305,
      READ = 306,
      WRITE = 307,
      STORED = 308,
@@ -829,11 +829,11 @@ extern "C" int hack_isatty( int )
 #define SIGNALS 298
 #define SLOTS 299
 #define TQ_OBJECT 300
-#define Q_PROPERTY 301
-#define Q_OVERRIDE 302
-#define Q_CLASSINFO 303
-#define Q_ENUMS 304
-#define Q_SETS 305
+#define TQ_PROPERTY 301
+#define TQ_OVERRIDE 302
+#define TQ_CLASSINFO 303
+#define TQ_ENUMS 304
+#define TQ_SETS 305
 #define READ 306
 #define WRITE 307
 #define STORED 308
@@ -1334,7 +1334,7 @@ static const char *const yytname[] =
   "ENUM", "CLASS", "STRUCT", "UNION", "ASM", "PRIVATE", "PROTECTED",
   "PUBLIC", "OPERATOR", "DBL_COLON", "TRIPLE_DOT", "TEMPLATE", "NAMESPACE",
   "USING", "MUTABLE", "THROW", "SIGNALS", "SLOTS", "TQ_OBJECT",
-  "Q_PROPERTY", "Q_OVERRIDE", "Q_CLASSINFO", "Q_ENUMS", "Q_SETS", "READ",
+  "TQ_PROPERTY", "TQ_OVERRIDE", "TQ_CLASSINFO", "TQ_ENUMS", "TQ_SETS", "READ",
   "WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", "'}'",
   "'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", "'*'",
   "'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", "'!'",
@@ -3639,7 +3639,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 1277 "moc.y"
     {
-						Q_PROPERTYdetected = TRUE;
+						TQ_PROPERTYdetected = TRUE;
 						BEGIN tmpYYStart;
 					   }
     break;
@@ -3656,7 +3656,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 1283 "moc.y"
     {
-						Q_PROPERTYdetected = TRUE;
+						TQ_PROPERTYdetected = TRUE;
 						BEGIN tmpYYStart;
 					   }
     break;
@@ -3673,7 +3673,7 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 1293 "moc.y"
-    { if ( tmpAccess == Public && Q_PROPERTYdetected )
+    { if ( tmpAccess == Public && TQ_PROPERTYdetected )
 						  BEGIN QT_DEF;
 					      else
 						  BEGIN IN_CLASS;
@@ -4129,7 +4129,7 @@ yyreduce:
 				    if ( g->propRead.isEmpty() && !g->propOverride )
 					moc_err( "A property must at least feature a read method." );
 				    checkPropertyName( (yyvsp[(2) - (4)].string) );
-				    Q_PROPERTYdetected = TRUE;
+				    TQ_PROPERTYdetected = TRUE;
 				    // Avoid duplicates
 				    for( TQPtrListIterator lit( g->props ); lit.current(); ++lit ) {
 					if ( lit.current()->name == (yyvsp[(2) - (4)].string) ) {
@@ -4845,7 +4845,7 @@ void initClass()				 // prepare for new class
     tmpAccess      = Private;
     subClassPerm       = Private;
     TQ_OBJECTdetected   = FALSE;
-    Q_PROPERTYdetected = FALSE;
+    TQ_PROPERTYdetected = FALSE;
     skipClass	       = FALSE;
     templateClass      = FALSE;
     g->slots.clear();
@@ -5381,7 +5381,7 @@ int generateProps()
 	    if ( p->getfunc == 0 ) {
 		if ( displayWarnings ) {
 
-		    // Is the type a set, that means, mentioned in Q_SETS?
+		    // Is the type a set, that means, mentioned in TQ_SETS?
 		    bool set = FALSE;
 		    for( TQPtrListIterator lit( g->enums ); lit.current(); ++lit )
 			if ( lit.current()->name == p->type && lit.current()->set )
@@ -5497,7 +5497,7 @@ int generateProps()
 	    if ( p->setfunc == 0 ) {
 		if ( displayWarnings ) {
 
-		    // Is the type a set, that means, mentioned in Q_SETS ?
+		    // Is the type a set, that means, mentioned in TQ_SETS ?
 		    bool set = FALSE;
 		    for( TQPtrListIterator lit( g->enums ); lit.current(); ++lit )
 			if ( lit.current()->name == p->type && lit.current()->set )
@@ -6370,7 +6370,7 @@ void addEnum()
 	}
     }
 
-    // Only look at types mentioned  in Q_ENUMS and Q_SETS
+    // Only look at types mentioned  in TQ_ENUMS and TQ_SETS
     if ( g->qtEnums.contains( tmpEnum->name ) || g->qtSets.contains( tmpEnum->name ) )
     {
 	g->enums.append( tmpEnum );
diff --git a/src/moc/moc_yacc.h b/src/moc/moc_yacc.h
index 84ef25bcd..3b3a7c151 100644
--- a/src/moc/moc_yacc.h
+++ b/src/moc/moc_yacc.h
@@ -82,11 +82,11 @@
      SIGNALS = 298,
      SLOTS = 299,
      TQ_OBJECT = 300,
-     Q_PROPERTY = 301,
-     Q_OVERRIDE = 302,
-     Q_CLASSINFO = 303,
-     Q_ENUMS = 304,
-     Q_SETS = 305,
+     TQ_PROPERTY = 301,
+     TQ_OVERRIDE = 302,
+     TQ_CLASSINFO = 303,
+     TQ_ENUMS = 304,
+     TQ_SETS = 305,
      READ = 306,
      WRITE = 307,
      STORED = 308,
@@ -139,11 +139,11 @@
 #define SIGNALS 298
 #define SLOTS 299
 #define TQ_OBJECT 300
-#define Q_PROPERTY 301
-#define Q_OVERRIDE 302
-#define Q_CLASSINFO 303
-#define Q_ENUMS 304
-#define Q_SETS 305
+#define TQ_PROPERTY 301
+#define TQ_OVERRIDE 302
+#define TQ_CLASSINFO 303
+#define TQ_ENUMS 304
+#define TQ_SETS 305
 #define READ 306
 #define WRITE 307
 #define STORED 308
diff --git a/src/sql/ntqdatabrowser.h b/src/sql/ntqdatabrowser.h
index 938b93208..54a1d9e8d 100644
--- a/src/sql/ntqdatabrowser.h
+++ b/src/sql/ntqdatabrowser.h
@@ -59,16 +59,16 @@ class TQDataBrowserPrivate;
 class Q_EXPORT TQDataBrowser : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking )
-    Q_PROPERTY( TQString filter READ filter WRITE setFilter )
-    Q_PROPERTY( TQStringList sort READ sort WRITE setSort )
-    Q_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
-    Q_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
-    Q_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
-    Q_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
-    Q_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
-    Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
-    Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
+    TQ_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking )
+    TQ_PROPERTY( TQString filter READ filter WRITE setFilter )
+    TQ_PROPERTY( TQStringList sort READ sort WRITE setSort )
+    TQ_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
+    TQ_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
+    TQ_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
+    TQ_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
+    TQ_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
+    TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
+    TQ_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
 
 public:
     TQDataBrowser( TQWidget* parent=0, const char* name=0, WFlags fl = 0 );
diff --git a/src/sql/ntqdatatable.h b/src/sql/ntqdatatable.h
index e92f8b6c8..489661c87 100644
--- a/src/sql/ntqdatatable.h
+++ b/src/sql/ntqdatatable.h
@@ -69,20 +69,20 @@ class TQM_EXPORT_SQL TQDataTable : public TQTable
 {
     TQ_OBJECT
 
-    Q_PROPERTY( TQString nullText READ nullText WRITE setNullText )
-    Q_PROPERTY( TQString trueText READ trueText WRITE setTrueText )
-    Q_PROPERTY( TQString falseText READ falseText WRITE setFalseText )
-    Q_PROPERTY( DateFormat dateFormat READ dateFormat WRITE setDateFormat )
-    Q_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
-    Q_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
-    Q_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
-    Q_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
-    Q_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
-    Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
-    Q_PROPERTY( TQString filter READ filter WRITE setFilter )
-    Q_PROPERTY( TQStringList sort READ sort WRITE setSort )
-    Q_PROPERTY( int numCols READ numCols )
-    Q_PROPERTY( int numRows READ numRows )
+    TQ_PROPERTY( TQString nullText READ nullText WRITE setNullText )
+    TQ_PROPERTY( TQString trueText READ trueText WRITE setTrueText )
+    TQ_PROPERTY( TQString falseText READ falseText WRITE setFalseText )
+    TQ_PROPERTY( DateFormat dateFormat READ dateFormat WRITE setDateFormat )
+    TQ_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits )
+    TQ_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert )
+    TQ_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate )
+    TQ_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete )
+    TQ_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels )
+    TQ_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit )
+    TQ_PROPERTY( TQString filter READ filter WRITE setFilter )
+    TQ_PROPERTY( TQStringList sort READ sort WRITE setSort )
+    TQ_PROPERTY( int numCols READ numCols )
+    TQ_PROPERTY( int numRows READ numRows )
 
 public:
     TQDataTable ( TQWidget* parent=0, const char* name=0 );
diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h
index 97b744b1a..75aa0dedc 100644
--- a/src/sql/ntqsqldatabase.h
+++ b/src/sql/ntqsqldatabase.h
@@ -79,12 +79,12 @@ public:
 class TQM_EXPORT_SQL TQSqlDatabase : public TQObject
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString databaseName  READ databaseName WRITE setDatabaseName )
-    Q_PROPERTY( TQString userName  READ userName WRITE setUserName )
-    Q_PROPERTY( TQString password  READ password WRITE setPassword )
-    Q_PROPERTY( TQString hostName  READ hostName WRITE setHostName )
-    Q_PROPERTY( int port READ port WRITE setPort )
-    Q_PROPERTY( TQString connectOptions READ connectOptions WRITE setConnectOptions )
+    TQ_PROPERTY( TQString databaseName  READ databaseName WRITE setDatabaseName )
+    TQ_PROPERTY( TQString userName  READ userName WRITE setUserName )
+    TQ_PROPERTY( TQString password  READ password WRITE setPassword )
+    TQ_PROPERTY( TQString hostName  READ hostName WRITE setHostName )
+    TQ_PROPERTY( int port READ port WRITE setPort )
+    TQ_PROPERTY( TQString connectOptions READ connectOptions WRITE setConnectOptions )
 
 public:
     ~TQSqlDatabase();
diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp
index 2d32583c3..a83f01862 100644
--- a/src/sql/qsqlpropertymap.cpp
+++ b/src/sql/qsqlpropertymap.cpp
@@ -250,7 +250,7 @@ void TQSqlPropertyMap::setProperty( TQWidget * widget, const TQVariant & value )
 
 /*!
   Insert a new classname/property pair, which is used for custom SQL
-  field editors. There \e must be a \c Q_PROPERTY clause in the \a
+  field editors. There \e must be a \c TQ_PROPERTY clause in the \a
   classname class declaration for the \a property.
 */
 void TQSqlPropertyMap::insert( const TQString & classname,
diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h
index a52027251..0c5e022e8 100644
--- a/src/table/ntqtable.h
+++ b/src/table/ntqtable.h
@@ -247,17 +247,17 @@ private:
 class TQM_EXPORT_TABLE TQTable : public TQScrollView
 {
     TQ_OBJECT
-    Q_ENUMS( SelectionMode FocusStyle )
-    Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
-    Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
-    Q_PROPERTY( bool showGrid READ showGrid WRITE setShowGrid )
-    Q_PROPERTY( bool rowMovingEnabled READ rowMovingEnabled WRITE setRowMovingEnabled )
-    Q_PROPERTY( bool columnMovingEnabled READ columnMovingEnabled WRITE setColumnMovingEnabled )
-    Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
-    Q_PROPERTY( bool sorting READ sorting WRITE setSorting )
-    Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
-    Q_PROPERTY( FocusStyle focusStyle READ focusStyle WRITE setFocusStyle )
-    Q_PROPERTY( int numSelections READ numSelections )
+    TQ_ENUMS( SelectionMode FocusStyle )
+    TQ_PROPERTY( int numRows READ numRows WRITE setNumRows )
+    TQ_PROPERTY( int numCols READ numCols WRITE setNumCols )
+    TQ_PROPERTY( bool showGrid READ showGrid WRITE setShowGrid )
+    TQ_PROPERTY( bool rowMovingEnabled READ rowMovingEnabled WRITE setRowMovingEnabled )
+    TQ_PROPERTY( bool columnMovingEnabled READ columnMovingEnabled WRITE setColumnMovingEnabled )
+    TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
+    TQ_PROPERTY( bool sorting READ sorting WRITE setSorting )
+    TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode )
+    TQ_PROPERTY( FocusStyle focusStyle READ focusStyle WRITE setFocusStyle )
+    TQ_PROPERTY( int numSelections READ numSelections )
 
     friend class TQTableHeader;
     friend class TQComboTableItem;
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);
diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h
index 6d454cce3..8a53303e8 100644
--- a/src/workspace/ntqworkspace.h
+++ b/src/workspace/ntqworkspace.h
@@ -63,7 +63,7 @@ class TQDockWindow;
 class TQM_EXPORT_WORKSPACE TQWorkspace : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled )
+    TQ_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled )
 
 #ifdef QT_WORKSPACE_WINDOWMODE
 public:
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index 9adf7830a..fc309cf29 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -42,7 +42,7 @@ class TQProcess;
 class TQAssistantClient : public TQObject
 {
     TQ_OBJECT
-    Q_PROPERTY( bool open READ isOpen )
+    TQ_PROPERTY( bool open READ isOpen )
 
 public:
     TQAssistantClient( const TQString &path, TQObject *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h
index 130d719a3..cfbfed213 100644
--- a/tools/designer/designer/formwindow.h
+++ b/tools/designer/designer/formwindow.h
@@ -72,7 +72,7 @@ class OrderIndicator;
 class FormWindow : public TQWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+    TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
     FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 );
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 85b5b6af8..c9dab83ae 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -126,12 +126,12 @@ class Spacer : public TQWidget
 {
     TQ_OBJECT
 
-    Q_OVERRIDE( TQCString name )
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
-    Q_ENUMS( SizeType )
-    Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
-    Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
-    Q_OVERRIDE( TQRect geometry DESIGNABLE false )
+    TQ_OVERRIDE( TQCString name )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_ENUMS( SizeType )
+    TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
+    TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+    TQ_OVERRIDE( TQRect geometry DESIGNABLE false )
 
 private:
     enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index cfb20c47e..27f9bfeb5 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -3141,7 +3141,7 @@ void PropertyList::setupProperties()
 	    continue;
 	if ( qstrcmp( p->name(), "maximumWidth" ) == 0 )
 	    continue;
-	if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case)
+	if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case)
 	    if ( !editor->widget()->isWidgetType() ||
 		 !editor->widget()->parent() ||
 		 !::tqt_cast(editor->widget()->parent()) )
diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/qcompletionedit.h
index fcc8b4aec..98caedba6 100644
--- a/tools/designer/designer/qcompletionedit.h
+++ b/tools/designer/designer/qcompletionedit.h
@@ -43,8 +43,8 @@ class TQVBox;
 class TQCompletionEdit : public TQLineEdit
 {
     TQ_OBJECT
-    Q_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
-    Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
+    TQ_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
+    TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
 
 public:
     TQCompletionEdit( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index e9639d03b..81cc634be 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -45,12 +45,12 @@ class StyledButton : public TQButton
 {
     TQ_OBJECT
 
-    Q_PROPERTY( TQColor color READ color WRITE setColor )
-    Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
-    Q_PROPERTY( EditorType editor READ editor WRITE setEditor )
-    Q_PROPERTY( bool scale READ scale WRITE setScale )
+    TQ_PROPERTY( TQColor color READ color WRITE setColor )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+    TQ_PROPERTY( EditorType editor READ editor WRITE setEditor )
+    TQ_PROPERTY( bool scale READ scale WRITE setScale )
 
-    Q_ENUMS( EditorType )
+    TQ_ENUMS( EditorType )
 
 public:
     enum EditorType { ColorEditor, PixmapEditor };
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 55d229077..c49066b4f 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -129,9 +129,9 @@ private:
 class TQDesignerTabWidget : public TQTabWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+    TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
     TQDesignerTabWidget( TQWidget *parent, const char *name );
 
@@ -158,8 +158,8 @@ private:
 class TQDesignerWidgetStack : public TQWidgetStack
 {
     TQ_OBJECT
-    Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+    TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
     TQDesignerWidgetStack( TQWidget *parent, const char *name );
 
@@ -201,10 +201,10 @@ private:
 class TQDesignerWizard : public TQWizard
 {
     TQ_OBJECT
-    Q_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
-    Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+    TQ_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+    TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
     TQDesignerWizard( TQWidget *parent, const char *name ) 
@@ -294,11 +294,11 @@ class Line : public TQFrame
 {
     TQ_OBJECT
 
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
-    Q_OVERRIDE( int frameWidth DESIGNABLE false )
-    Q_OVERRIDE( Shape frameShape DESIGNABLE false )
-    Q_OVERRIDE( TQRect frameRect DESIGNABLE false )
-    Q_OVERRIDE( TQRect contentsRect DESIGNABLE false )
+    TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_OVERRIDE( int frameWidth DESIGNABLE false )
+    TQ_OVERRIDE( Shape frameShape DESIGNABLE false )
+    TQ_OVERRIDE( TQRect frameRect DESIGNABLE false )
+    TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false )
 public:
     Line( TQWidget *parent, const char *name )
 	: TQFrame( parent, name, WMouseNoMask ) {
@@ -320,7 +320,7 @@ class TQDesignerLabel : public TQLabel
 {
     TQ_OBJECT
 
-    Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
+    TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
 
 public:
     TQDesignerLabel( TQWidget *parent = 0, const char *name = 0 )
@@ -371,7 +371,7 @@ private:
 class TQDesignerDialog : public TQDialog
 {
     TQ_OBJECT
-    Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+    TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
     TQDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name )
@@ -392,7 +392,7 @@ private:
 class TQDesignerToolButton : public TQToolButton
 {
     TQ_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
     TQDesignerToolButton( TQWidget *parent, const char *name )
@@ -415,7 +415,7 @@ public:
 class TQDesignerRadioButton : public TQRadioButton
 {
     TQ_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
     TQDesignerRadioButton( TQWidget *parent, const char *name )
@@ -440,7 +440,7 @@ public:
 class TQDesignerPushButton : public TQPushButton
 {
     TQ_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
     TQDesignerPushButton( TQWidget *parent, const char *name )
@@ -464,7 +464,7 @@ public:
 class TQDesignerCheckBox : public TQCheckBox
 {
     TQ_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
     TQDesignerCheckBox( TQWidget *parent, const char *name )
@@ -488,9 +488,9 @@ public:
 class TQDesignerToolBox : public TQToolBox
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
-    Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
+    TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
 
 public:
     TQDesignerToolBox( TQWidget *parent, const char *name );
diff --git a/tools/designer/examples/filechooser/widget/filechooser.h b/tools/designer/examples/filechooser/widget/filechooser.h
index 8a8232946..4210dc24c 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.h
+++ b/tools/designer/examples/filechooser/widget/filechooser.h
@@ -16,9 +16,9 @@ class QT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget
 {
     TQ_OBJECT
 
-    Q_ENUMS( Mode )
-    Q_PROPERTY( Mode mode READ mode WRITE setMode )
-    Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+    TQ_ENUMS( Mode )
+    TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+    TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
     FileChooser( TQWidget *parent = 0, const char *name = 0);
diff --git a/tools/designer/examples/opengl/glwidget.h b/tools/designer/examples/opengl/glwidget.h
index 43d68783b..565efb4a5 100644
--- a/tools/designer/examples/opengl/glwidget.h
+++ b/tools/designer/examples/opengl/glwidget.h
@@ -40,10 +40,10 @@
 class GLWidget : public TQGLWidget
 {
     TQ_OBJECT
-    Q_PROPERTY( double xRot READ xRot WRITE setXRot )
-    Q_PROPERTY( double yRot READ yRot WRITE setYRot )
-    Q_PROPERTY( double zRot READ zRot WRITE setZRot )
-    Q_PROPERTY( double scale READ scale WRITE setScale )
+    TQ_PROPERTY( double xRot READ xRot WRITE setXRot )
+    TQ_PROPERTY( double yRot READ yRot WRITE setYRot )
+    TQ_PROPERTY( double zRot READ zRot WRITE setZRot )
+    TQ_PROPERTY( double scale READ scale WRITE setScale )
 
 public:
     GLWidget( TQWidget* parent, const char* name );
diff --git a/tools/designer/examples/sizeaware/sizeaware.h b/tools/designer/examples/sizeaware/sizeaware.h
index 8e1adaae1..b939cfe4e 100644
--- a/tools/designer/examples/sizeaware/sizeaware.h
+++ b/tools/designer/examples/sizeaware/sizeaware.h
@@ -5,8 +5,8 @@
 class SizeAware : public TQDialog
 {
     TQ_OBJECT
-    Q_PROPERTY( TQString company READ company WRITE setCompany )
-    Q_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile )
+    TQ_PROPERTY( TQString company READ company WRITE setCompany )
+    TQ_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile )
 public:
     SizeAware( TQDialog *parent = 0, const char *name = 0, bool modal = FALSE );
     ~SizeAware();
-- 
cgit v1.2.1