diff --git a/ChangeLog.immodule b/ChangeLog.immodule index d856b5bf..46a5e9d7 100644 --- a/ChangeLog.immodule +++ b/ChangeLog.immodule @@ -1319,7 +1319,7 @@ But it costs immodule developer small modification. * src/kernel/ntqinputcontext.h - - (class QInputContext): Inherit QObject and add Q_OBJECT macro + - (class QInputContext): Inherit QObject and add TQ_OBJECT macro - (name): Remove to rename to identifierName() to avoid conflicting with QObject::name() - (identifierName): New function. Renamed from name() @@ -1419,7 +1419,7 @@ - Add #include "ntqinputcontext.h" to avoid compilation error * src/input/qximinputcontext_p.h - - (class QXIMInputContext): Add Q_OBJECT macro to follow the API change + - (class QXIMInputContext): Add TQ_OBJECT macro to follow the API change - (name): Remove to follow the API change - (identifierName): * New function. Renamed from name() diff --git a/configure b/configure index 2510cc35..c1218d9a 100755 --- a/configure +++ b/configure @@ -3124,7 +3124,7 @@ EOF for MODULE in $MODULES; do if [ -d "$relpath/src/$MODULE" ]; then M=`echo $MODULE | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - echo "#define QT_MODULE_$M" >>$outpath/include/ntqmodules.h.new + echo "#define TQT_MODULE_$M" >>$outpath/include/ntqmodules.h.new fi done @@ -3138,7 +3138,7 @@ else fi #------------------------------------------------------------------------------- -# generate QT_BUILD_KEY +# generate TQT_BUILD_KEY #------------------------------------------------------------------------------- # some compilers generate binary incompatible code between different versions, @@ -3275,7 +3275,7 @@ for build_option in $D_FLAGS; do done # sort the compile time defines (helps ensure that changes in this configure -# script don't affect the QT_BUILD_KEY generation) +# script don't affect the TQT_BUILD_KEY generation) if [ -f .options ]; then for opt in `sort -f .options | uniq`; do BUILD_OPTIONS="$BUILD_OPTIONS $opt" @@ -3284,9 +3284,9 @@ fi rm -f .options BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS" -QT_BUILD_KEY="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS" +TQT_BUILD_KEY="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS" # strip out leading/trailing/extra whitespace -QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` +TQT_BUILD_KEY=`echo $TQT_BUILD_KEY | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` #------------------------------------------------------------------------------- # part of configuration information goes into ntqconfig.h @@ -3309,7 +3309,7 @@ cat >> $outpath/include/ntqconfig.h.new < class CustomStyle : public QWindowsStyle { - Q_OBJECT + TQ_OBJECT public: CustomStyle(); ~CustomStyle(); diff --git a/doc/debug.doc b/doc/debug.doc index 6047582a..91ec8af2 100644 --- a/doc/debug.doc +++ b/doc/debug.doc @@ -99,7 +99,7 @@ Two important macros are: \i \link ::Q_ASSERT() Q_ASSERT(b)\endlink where b is a boolean expression, writes the warning: "ASSERT: 'b' in file file.cpp (234)" if b is FALSE. -\i \link ::Q_CHECK_PTR() Q_CHECK_PTR(p)\endlink where p is a pointer. +\i \link ::TQ_CHECK_PTR() TQ_CHECK_PTR(p)\endlink where p is a pointer. Writes the warning "In file file.cpp, line 234: Out of memory" if p is 0. \endlist @@ -110,7 +110,7 @@ These macros are useful for detecting program errors, e.g. like this: { Q_ASSERT( size > 0 ); char *p = new char[size]; - Q_CHECK_PTR( p ); + TQ_CHECK_PTR( p ); return p; } \endcode @@ -121,22 +121,22 @@ exit after printing the error message. Note that the Q_ASSERT macro is a null expression if \c QT_CHECK_STATE (see below) is not defined. Any code in it will simply not be -executed. Similarly Q_CHECK_PTR is a null expression if \c QT_CHECK_NULL is +executed. Similarly TQ_CHECK_PTR is a null expression if \c QT_CHECK_NULL is not defined. Here is an example of how you should \e not use Q_ASSERT and -Q_CHECK_PTR: +TQ_CHECK_PTR: \code char *alloc( int size ) { char *p; - Q_CHECK_PTR( p = new char[size] ); // WRONG! + TQ_CHECK_PTR( p = new char[size] ); // WRONG! return p; } \endcode The problem is tricky: \e p is set to a sane value only as long as the correct checking flags are defined. If this code is compiled without -the QT_CHECK_NULL flag defined, the code in the Q_CHECK_PTR expression is +the QT_CHECK_NULL flag defined, the code in the TQ_CHECK_PTR expression is not executed (correctly, since it's only a debugging aid) and \e alloc returns a wild pointer. @@ -179,7 +179,7 @@ Example: \section1 Common bugs There is one bug that is so common that it deserves mention here: If -you include the Q_OBJECT macro in a class declaration and run the +you include the TQ_OBJECT macro in a class declaration and run the \link moc.html moc\endlink, but forget to link the moc-generated object code into your executable, you will get very confusing error messages. Any link error complaining about a lack of \c{vtbl}, diff --git a/doc/html/aclock-example.html b/doc/html/aclock-example.html index 42fa56c3..05e1d616 100644 --- a/doc/html/aclock-example.html +++ b/doc/html/aclock-example.html @@ -55,7 +55,7 @@ This example displays an analog clock widget. class TQTimer; class AnalogClock : public TQWidget // analog clock widget { - Q_OBJECT + TQ_OBJECT public: AnalogClock( TQWidget *parent=0, const char *name=0 ); void setAutoMask(bool b); diff --git a/doc/html/activeqt-dotnet.html b/doc/html/activeqt-dotnet.html index e5602e25..ce36ca10 100644 --- a/doc/html/activeqt-dotnet.html +++ b/doc/html/activeqt-dotnet.html @@ -132,7 +132,7 @@ managed programming language. 
    // native TQt/C++ class
     class Worker : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY(TQString statusString READ statusString WRITE setStatusString)
     public:
         Worker();
diff --git a/doc/html/addressbook-example.html b/doc/html/addressbook-example.html
index a17f7620..54a26fcd 100644
--- a/doc/html/addressbook-example.html
+++ b/doc/html/addressbook-example.html
@@ -59,7 +59,7 @@ class ABCentralWidget;
 
 class ABMainWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ABMainWindow();
@@ -230,7 +230,7 @@ class TQCheckBox;
 
 class ABCentralWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ABCentralWidget( TQWidget *parent, const char *name = 0 );
diff --git a/doc/html/biff-example.html b/doc/html/biff-example.html
index 8756b438..306372fa 100644
--- a/doc/html/biff-example.html
+++ b/doc/html/biff-example.html
@@ -57,7 +57,7 @@ mail; it looks exactly like xbiff but is much shorter.
 
 class Biff : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Biff( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/buttongroups-example.html b/doc/html/buttongroups-example.html
index a6937c54..bf6b0edf 100644
--- a/doc/html/buttongroups-example.html
+++ b/doc/html/buttongroups-example.html
@@ -57,7 +57,7 @@ class TQRadioButton;
 
 class ButtonsGroups : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ButtonsGroups( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html
index f1730753..6142313a 100644
--- a/doc/html/canvas-chart-example.html
+++ b/doc/html/canvas-chart-example.html
@@ -170,7 +170,7 @@ class TQString;
 
 class ChartForm: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum { MAX_ELEMENTS = 100 };
     enum { MAX_RECENTFILES = 9 }; // Must not exceed 9
diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html
index b9b0090e..40f6d9c8 100644
--- a/doc/html/canvas-example.html
+++ b/doc/html/canvas-example.html
@@ -57,7 +57,7 @@ public:
 
 
 class FigureEditor : public TQCanvasView {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FigureEditor(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0);
@@ -76,7 +76,7 @@ private:
 };
 
 class Main : public TQMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Main(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0);
diff --git a/doc/html/chart-canvasview-h.html b/doc/html/chart-canvasview-h.html
index d48f2a4c..9fd16d90 100644
--- a/doc/html/chart-canvasview-h.html
+++ b/doc/html/chart-canvasview-h.html
@@ -46,7 +46,7 @@ class TQPoint;
 
 class CanvasView : public TQCanvasView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CanvasView( TQCanvas *canvas, ElementVector *elements,
                 TQWidget* parent = 0, const char* name = "canvas view",
diff --git a/doc/html/chart-chartform-h.html b/doc/html/chart-chartform-h.html
index 01586c34..b4a91c07 100644
--- a/doc/html/chart-chartform-h.html
+++ b/doc/html/chart-chartform-h.html
@@ -52,7 +52,7 @@ class TQString;
 
 class ChartForm: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum { MAX_ELEMENTS = 100 };
     enum { MAX_RECENTFILES = 9 }; // Must not exceed 9
diff --git a/doc/html/chart-optionsform-h.html b/doc/html/chart-optionsform-h.html
index 12a3710f..b65f68cb 100644
--- a/doc/html/chart-optionsform-h.html
+++ b/doc/html/chart-optionsform-h.html
@@ -51,7 +51,7 @@ class TQVBoxLayout;
 
 class OptionsForm : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     OptionsForm( TQWidget* parent = 0, const char* name = "options form",
                  bool modal = FALSE, WFlags f = 0 );
diff --git a/doc/html/chart-setdataform-h.html b/doc/html/chart-setdataform-h.html
index 1fa6efba..47a77b24 100644
--- a/doc/html/chart-setdataform-h.html
+++ b/doc/html/chart-setdataform-h.html
@@ -47,7 +47,7 @@ class TQVBoxLayout;
 
 class SetDataForm: public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SetDataForm( ElementVector *elements, int decimalPlaces,
                  TQWidget *parent = 0, const char *name = "set data form",
diff --git a/doc/html/checklists-example.html b/doc/html/checklists-example.html
index 510e3c79..54f945f0 100644
--- a/doc/html/checklists-example.html
+++ b/doc/html/checklists-example.html
@@ -57,7 +57,7 @@ class TQLabel;
 
 class CheckLists : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CheckLists( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/clientserver-example.html b/doc/html/clientserver-example.html
index 13552bf9..5753ac9a 100644
--- a/doc/html/clientserver-example.html
+++ b/doc/html/clientserver-example.html
@@ -74,7 +74,7 @@ specified. You can send single lines to the server.
 */
 class ClientSocket : public TQSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ClientSocket( int sock, TQObject *parent=0, const char *name=0 ) :
         TQSocket( parent, name )
@@ -121,7 +121,7 @@ private:
 */
 class SimpleServer : public TQServerSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SimpleServer( TQObject* parent=0 ) :
         TQServerSocket( 4242, 1, parent )
@@ -153,7 +153,7 @@ signals:
 */
 class ServerInfo : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ServerInfo()
     {
@@ -235,7 +235,7 @@ int main( int argc, char** argv )
 
 class Client : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Client( const TQString &host, Q_UINT16 port )
     {
diff --git a/doc/html/commonproblems.html b/doc/html/commonproblems.html
index 8074f0f8..55da31fa 100644
--- a/doc/html/commonproblems.html
+++ b/doc/html/commonproblems.html
@@ -53,7 +53,7 @@ machine
 
 
 
 Link error, complaining about a lack of vtbl, _vtbl, __vtbl or similar
 

-
 This indicates that you've included the Q_OBJECT macro in a class
+
 This indicates that you've included the TQ_OBJECT macro in a class
 declaration and probably also run the moc, but forgot to link the
 moc-generated object code into your executable. See Using the Meta Object Compiler for details on how to use moc.
 
 
diff --git a/doc/html/customstyles.html b/doc/html/customstyles.html
index 541b5ee3..560a4a7b 100644
--- a/doc/html/customstyles.html
+++ b/doc/html/customstyles.html
@@ -74,7 +74,7 @@ declaration:
 #include <ntqwindowsstyle.h>
 
 class CustomStyle : public TQWindowsStyle {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CustomStyle();
     ~CustomStyle();
diff --git a/doc/html/dclock-example.html b/doc/html/dclock-example.html
index 48bdaeb4..97814072 100644
--- a/doc/html/dclock-example.html
+++ b/doc/html/dclock-example.html
@@ -55,7 +55,7 @@ and date.
 
 class DigitalClock : public TQLCDNumber          // digital clock widget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DigitalClock( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/debug.html b/doc/html/debug.html
index c48aa6e0..23c84dd9 100644
--- a/doc/html/debug.html
+++ b/doc/html/debug.html
@@ -81,7 +81,7 @@ often useful even without names.
 
  •  Q_ASSERT(b) where b is a boolean
 expression, writes the warning: "ASSERT: 'b' in file file.cpp (234)"
 if b is FALSE.
-
  •  Q_CHECK_PTR(p) where p is a pointer.
+
  •  TQ_CHECK_PTR(p) where p is a pointer.
 Writes the warning "In file file.cpp, line 234: Out of memory" if p is
 0.
 
@@ -91,7 +91,7 @@ Writes the warning "In file file.cpp, line 234: Out of memory" if p is
   {
       Q_ASSERT( size > 0 );
       char *p = new char[size];
-      Q_CHECK_PTR( p );
+      TQ_CHECK_PTR( p );
       return p;
   }
    • @@ -101,21 +101,21 @@ instead of warning(), so a failed assertion will cause the program to exit after printing the error message.

    Note that the Q_ASSERT macro is a null expression if QT_CHECK_STATE (see below) is not defined. Any code in it will simply not be -executed. Similarly Q_CHECK_PTR is a null expression if QT_CHECK_NULL is +executed. Similarly TQ_CHECK_PTR is a null expression if QT_CHECK_NULL is not defined. Here is an example of how you should not use Q_ASSERT and -Q_CHECK_PTR: +TQ_CHECK_PTR: 

       char *alloc( int size )
   {
       char *p;
-      Q_CHECK_PTR( p = new char[size] ); // WRONG!
+      TQ_CHECK_PTR( p = new char[size] ); // WRONG!
       return p;
   }

    The problem is tricky: p is set to a sane value only as long as the correct checking flags are defined. If this code is compiled without -the QT_CHECK_NULL flag defined, the code in the Q_CHECK_PTR expression is +the QT_CHECK_NULL flag defined, the code in the TQ_CHECK_PTR expression is not executed (correctly, since it's only a debugging aid) and alloc returns a wild pointer.

    The TQt library contains hundreds of internal checks that will print @@ -154,7 +154,7 @@ define QT_NO_CHECK.

    Common bugs

    There is one bug that is so common that it deserves mention here: If -you include the Q_OBJECT macro in a class declaration and run the +you include the TQ_OBJECT macro in a class declaration and run the moc, but forget to link the moc-generated object code into your executable, you will get very confusing error messages. Any link error complaining about a lack of vtbl, diff --git a/doc/html/designer-manual-6.html b/doc/html/designer-manual-6.html index b07ac78a..dfa747a9 100644 --- a/doc/html/designer-manual-6.html +++ b/doc/html/designer-manual-6.html @@ -47,7 +47,7 @@ SOURCES += main.cpp

    When subclassing a form it is helpful to use a naming convention to help us identify which files are generated from TQt Designer's .ui files and which are hand coded.

    Suppose, for example, that we are developing a dialog and writing the code directly in TQt Designer. We might call our dialog 'OptionsForm' and the .ui file, optionsform.ui. The automatically generated files will be optionsform.h and optionsform.cpp.

    If we were developing another dialog, but this time one that we intended to subclass, we want to make it easy to distinguish between the automatically generated files and our hand coded files. For example, we might call our dialog 'SettingsFormBase' and the .ui file settingsformbase.ui. The automatically generated files would then be called settingsformbase.h and settingsformbase.cpp. We would then call our subclass 'SettingsForm' and code it in the files settingsform.h and settingsform.cpp.

    -

    Any subclass of a form should include the Q_OBJECT macro so that slots and signals will work correctly. Once you've created your subclass be sure to add the .h and the .cpp files to the .pro project file. For example we would add the following lines for our subclassed 'SettingsForm' at the end of the .pro file:

    +

    Any subclass of a form should include the TQ_OBJECT macro so that slots and signals will work correctly. Once you've created your subclass be sure to add the .h and the .cpp files to the .pro project file. For example we would add the following lines for our subclassed 'SettingsForm' at the end of the .pro file:

     HEADERS += settingsform.h
 SOURCES += settingsform.cpp
@@ -102,7 +102,7 @@ int main( int argc, char *argv[] )
 
     class CreditForm : public CreditFormBase
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         CreditForm( TQWidget* parent = 0, const char* name = 0,
                     bool modal = FALSE, WFlags fl = 0 );
@@ -111,7 +111,7 @@ int main( int argc, char *argv[] )
         void setAmount();
     };
    -

    We've declared the slot, setAmount(), that we created in TQt Designer. The Q_OBJECT macro is included because it is essential for classes that use signals and slots.

    +

    We've declared the slot, setAmount(), that we created in TQt Designer. The TQ_OBJECT macro is included because it is essential for classes that use signals and slots.

    The implementation in qt/tools/designer/examples/credit/creditform.cpp is simple:

        #include <ntqradiobutton.h>
     #include <ntqspinbox.h>
@@ -250,7 +250,7 @@ INCLUDEPATH += $(QTDIR)/tools/designer/uilib
 
 class Receiver : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     void setParent( TQDialog *parent );
 public slots:
@@ -259,7 +259,7 @@ private:
     TQDialog *p;
 };
    -

    Our class must be a TQObject subclass and because we're using signals and slots it must include the Q_OBJECT macro. We declare a function and the setAmount() slot that we wish to implement as well as a private TQDialog pointer.

    +

    Our class must be a TQObject subclass and because we're using signals and slots it must include the TQ_OBJECT macro. We declare a function and the setAmount() slot that we wish to implement as well as a private TQDialog pointer.

    The implementation requires the header files of the classes it uses:

        #include <ntqradiobutton.h>
     #include <ntqspinbox.h>
diff --git a/doc/html/designer-manual-7.html b/doc/html/designer-manual-7.html
index 50d7f36b..339153a3 100644
--- a/doc/html/designer-manual-7.html
+++ b/doc/html/designer-manual-7.html
@@ -45,7 +45,7 @@ body { background: #ffffff; color: black; }
 
     class Vcr : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Vcr( TQWidget *parent = 0, const char *name = 0 );
         ~Vcr() {}
@@ -56,8 +56,8 @@ body { background: #ffffff; color: black; }
         void stop();
     };
    -

    We include ntqwidget.h since we'll be deriving our custom widget from TQWidget. We declare a constructor where the widget will be created and the four signals we want our widget to emit.

    -

    Note: Since we're using signals we must also include the Q_OBJECT macro. This macro also ensures that information about the class is available via the Meta Object System and ensures that TQt Designer will display the correct information about the widget.

    +

    We include ntqwidget.h since we'll be deriving our custom widget from TQWidget. We declare a constructor where the widget will be created and the four signals we want our widget to emit.

    +

    Note: Since we're using signals we must also include the TQ_OBJECT macro. This macro also ensures that information about the class is available via the Meta Object System and ensures that TQt Designer will display the correct information about the widget.

    The implementation is straightforward. The only function we implement is the constructor. The rest of the file consists of include statements and embedded .xpm images.

        Vcr::Vcr( TQWidget *parent, const char *name )
         : TQWidget( parent, name )
@@ -128,10 +128,10 @@ 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 Q_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 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.
    
 
        class QT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
 
         Q_ENUMS( Mode )
         Q_PROPERTY( Mode mode READ mode WRITE setMode )
diff --git a/doc/html/designer-manual-9.html b/doc/html/designer-manual-9.html
index d87a9451..e25e7bc1 100644
--- a/doc/html/designer-manual-9.html
+++ b/doc/html/designer-manual-9.html
@@ -107,11 +107,11 @@ body { background: #ffffff; color: black; }
 
  • Use TQt -- Add the TQt libraries to the active project
    
 
  • Add MOC -- Add the moc precompiler to the active file
    
 
    Double clicking a .ui file in the workspace overview will now launch TQt Designer.
    
-
    If you create a .cpp file which contains the Q_OBJECT macro you will need an additional file which is generated by the moc to be included in your project. For example, if you have 'file.cpp', then the last line would be #include "file.moc" and the additional file would be called 'file.moc'. To ensure that Visual Studio executes the moc and generates this file you must create a custom dependency. Double click the .cpp file (in your project workspace) that contains the Q_OBJECT macro. Click the Add MOC toolbar button; this will create an empty .moc file in your project workspace. Right click the newly created .moc file, then click Settings from the pop-up menu to invoke the Project Settings dialog. Click the Custom Build tab. Click the Dependencies button to pop up the User Defined Dependencies dialog. Type in $(InputDir)\$(InputPath), then press Return. Click OK to leave the Dependencies dialog, then click OK to leave the Project Settings dialog.
    
+
    If you create a .cpp file which contains the TQ_OBJECT macro you will need an additional file which is generated by the moc to be included in your project. For example, if you have 'file.cpp', then the last line would be #include "file.moc" and the additional file would be called 'file.moc'. To ensure that Visual Studio executes the moc and generates this file you must create a custom dependency. Double click the .cpp file (in your project workspace) that contains the TQ_OBJECT macro. Click the Add MOC toolbar button; this will create an empty .moc file in your project workspace. Right click the newly created .moc file, then click Settings from the pop-up menu to invoke the Project Settings dialog. Click the Custom Build tab. Click the Dependencies button to pop up the User Defined Dependencies dialog. Type in $(InputDir)\$(InputPath), then press Return. Click OK to leave the Dependencies dialog, then click OK to leave the Project Settings dialog.
    
 
    If you wish to delete the add-in remove it from the toolbar then delete the qmsdev.dll file from the add-ins directory.
    
 
    Creating Makefiles without qmake
    
 
    The qmake tool provided with TQt can create Makefiles appropriate to your platform based on .pro project files. This section describes the dependencies involved in building a TQt application and gives a couple of simple example Makefiles. This section assumes that you have a good understanding of Makefiles.
    
-
    TQt Designer produces .ui files which are used to generate .h and .cpp files for the compiler to compile. The .ui files are processed by uic. Classes which inherit from TQObject, e.g. those which use slots and signals, require an additional .cpp file to be generated. These files are generated by the moc and are named 'moc_file.cpp' where the original .cpp file is called 'file.cpp'. If your .cpp file contains the Q_OBJECT macro an additional file 'file.moc' should be generated which must be #included in the .cpp, normally at the end. This requires an extra dependency being created.
    
+
    TQt Designer produces .ui files which are used to generate .h and .cpp files for the compiler to compile. The .ui files are processed by uic. Classes which inherit from TQObject, e.g. those which use slots and signals, require an additional .cpp file to be generated. These files are generated by the moc and are named 'moc_file.cpp' where the original .cpp file is called 'file.cpp'. If your .cpp file contains the TQ_OBJECT macro an additional file 'file.moc' should be generated which must be #included in the .cpp, normally at the end. This requires an extra dependency being created.
    
 
    Processing .ui files with uic is done twice:
    
 
     uic myform.ui -o myform.h
diff --git a/doc/html/dirview-example.html b/doc/html/dirview-example.html
index c0a9e7f6..ebb7deda 100644
--- a/doc/html/dirview-example.html
+++ b/doc/html/dirview-example.html
@@ -113,7 +113,7 @@ private:
 
 class DirectoryView : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DirectoryView( TQWidget *parent = 0, const char *name = 0, bool sdo = FALSE );
diff --git a/doc/html/drawdemo-example.html b/doc/html/drawdemo-example.html
index 98fae358..07f2c112 100644
--- a/doc/html/drawdemo-example.html
+++ b/doc/html/drawdemo-example.html
@@ -170,7 +170,7 @@ DrawThing ourDrawFunctions[] = {
 
 class DrawView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DrawView();
     ~DrawView();
diff --git a/doc/html/fileiconview-example.html b/doc/html/fileiconview-example.html
index 78a1a849..b835b6f3 100644
--- a/doc/html/fileiconview-example.html
+++ b/doc/html/fileiconview-example.html
@@ -73,7 +73,7 @@ class TQResizeEvent;
 
 class TQtFileIconDrag : public TQIconDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQtFileIconDrag( TQWidget * dragSource, const char* name = 0 );
@@ -96,7 +96,7 @@ private:
 class TQtFileIconViewItem;
 class TQtFileIconView : public TQIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQtFileIconView( const TQString &dir, TQWidget *parent = 0, const char *name = 0 );
@@ -1079,7 +1079,7 @@ class TQToolButton;
 
 class FileMainWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FileMainWindow();
diff --git a/doc/html/forever-example.html b/doc/html/forever-example.html
index 25817f78..b8193a0d 100644
--- a/doc/html/forever-example.html
+++ b/doc/html/forever-example.html
@@ -63,7 +63,7 @@ const int numColors = 120;
 
 class Forever : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Forever( TQWidget *parent=0, const char *name=0 );
 protected:
diff --git a/doc/html/functions.html b/doc/html/functions.html
index f04d62d9..915f5a0d 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -40,8 +40,8 @@ API with links to the class documentation for each function.
 
      
 
    • DTDHandler:
  TQXmlReader
    • Q_ASSERT:
- TQApplication
    • Q_CHECK_PTR:
- TQApplication
    • 
+ TQApplication
    • TQ_CHECK_PTR:
+ TQApplication
    • 
 abort:
  TQFtp TQHttp TQPrinter
    • aborted:
  TQPrinter
    • about:
diff --git a/doc/html/grapher-nsplugin-example.html b/doc/html/grapher-nsplugin-example.html
index 03759058..e373bad8 100644
--- a/doc/html/grapher-nsplugin-example.html
+++ b/doc/html/grapher-nsplugin-example.html
@@ -121,7 +121,7 @@ public:
 //
 
 class Graph : public TQNPWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     // Constructs a Graph to display a GraphModel
     //
@@ -449,7 +449,7 @@ const char* Graph::styleName[] = { "Pie", "Bar", 0 };
 //
 
 class Grapher : public TQNPInstance, GraphModel {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     // Create a Grapher - all Grapher plugins are created
     // by one GrapherPlugin object.
diff --git a/doc/html/hello-example.html b/doc/html/hello-example.html
index 821c3ec5..2d20c312 100644
--- a/doc/html/hello-example.html
+++ b/doc/html/hello-example.html
@@ -55,7 +55,7 @@ and in different colors.
 
 class Hello : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Hello( const char *text, TQWidget *parent=0, const char *name=0 );
 signals:
diff --git a/doc/html/helpsystem-example.html b/doc/html/helpsystem-example.html
index 69c99815..835e00d2 100644
--- a/doc/html/helpsystem-example.html
+++ b/doc/html/helpsystem-example.html
@@ -145,7 +145,7 @@ the cell, and use TQToolTip::tip() to display
 in a tooltip and to provide text for the TQToolTipGroup as before. 
 
          class WhatsThis : public TQObject, public TQWhatsThis
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         WhatsThis( TQWidget *w, TQWidget *watch = 0 );
 
@@ -303,7 +303,7 @@ and return a string accordingly.
 
 
          class MainWindow : public TQMainWindow
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         MainWindow();
         ~MainWindow();
diff --git a/doc/html/helpviewer-example.html b/doc/html/helpviewer-example.html
index 08bb94c0..a72528c9 100644
--- a/doc/html/helpviewer-example.html
+++ b/doc/html/helpviewer-example.html
@@ -61,7 +61,7 @@ class TQPopupMenu;
 
 class HelpWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HelpWindow( const TQString& home_,  const TQString& path, TQWidget* parent = 0, const char *name=0 );
     ~HelpWindow();
diff --git a/doc/html/httpd-example.html b/doc/html/httpd-example.html
index aa923a15..733d2e29 100644
--- a/doc/html/httpd-example.html
+++ b/doc/html/httpd-example.html
@@ -63,7 +63,7 @@ sending the page, it closes the connection.
 // HttpDaemon is the the class that implements the simple HTTP server.
 class HttpDaemon : public TQServerSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HttpDaemon( TQObject* parent=0 ) :
         TQServerSocket(8080,1,parent)
@@ -126,7 +126,7 @@ private slots:
 // the actions of the server.
 class HttpInfo : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HttpInfo()
     {
diff --git a/doc/html/i18n-example.html b/doc/html/i18n-example.html
index 1cd12b0d..a517c949 100644
--- a/doc/html/i18n-example.html
+++ b/doc/html/i18n-example.html
@@ -57,7 +57,7 @@ This example shows how to internationalize applications. Start it with
 
 class MyWidget : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MyWidget( TQWidget* parent=0, const char* name = 0 );
diff --git a/doc/html/iconview-example.html b/doc/html/iconview-example.html
index a158fe43..a7e74209 100644
--- a/doc/html/iconview-example.html
+++ b/doc/html/iconview-example.html
@@ -58,7 +58,7 @@ view modes, rubberband selection, etc.
 
 class ListenDND : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListenDND( TQWidget *w )
diff --git a/doc/html/iconview-simple_dd-main-h.html b/doc/html/iconview-simple_dd-main-h.html
index 5784205a..b7218f5c 100644
--- a/doc/html/iconview-simple_dd-main-h.html
+++ b/doc/html/iconview-simple_dd-main-h.html
@@ -55,7 +55,7 @@ class TQDragDropEvent;
 
 class DDListBox : public TQListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DDListBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
     // Low-level drag and drop
@@ -83,7 +83,7 @@ public:
 
 class DDIconView : public TQIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DDIconView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) :
         TQIconView( parent, name, f ) {}
diff --git a/doc/html/index b/doc/html/index
index 335534ca..6d43b50a 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -8101,7 +8101,7 @@
 "QXtWidget::xtWidget" qxtwidget.html#xtWidget
 "QXtWidget::~QXtWidget" qxtwidget.html#~QXtWidget
 "Q_ASSERT" ntqapplication.html#Q_ASSERT
-"Q_CHECK_PTR" ntqapplication.html#Q_CHECK_PTR
+"TQ_CHECK_PTR" ntqapplication.html#TQ_CHECK_PTR
 "Qt" ntqt.html
 "Qt Commercial Editions" commercialeditions.html
 "Qt Demo" demo-example.html
diff --git a/doc/html/integration.html b/doc/html/integration.html
index fc526750..55f9e412 100644
--- a/doc/html/integration.html
+++ b/doc/html/integration.html
@@ -153,8 +153,8 @@ sets any other settings needed to use TQt in that project.
 
       The 'Add MOC' button will add in the custom build step for the selected file
 so that it creates any needed MOC files and it will add these generated
 files to the project. All you need to do to use it is click on a file that
-has Q_OBJECT and click the button. 
-
       You only need to use this button if you added a file that has Q_OBJECT in it by hand, you don't need to use this if you used any
+has TQ_OBJECT and click the button. 
+
       You only need to use this button if you added a file that has TQ_OBJECT in it by hand, you don't need to use this if you used any
 of the previously mentioned buttons. It can also be invoked by using
 the Ctrl+Shift+M key combination in Visual Studio.
 
       
diff --git a/doc/html/life-example.html b/doc/html/life-example.html
index ed6771cd..da5b3ef4 100644
--- a/doc/html/life-example.html
+++ b/doc/html/life-example.html
@@ -53,7 +53,7 @@ body { background: #ffffff; color: black; }
 
 class LifeWidget : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LifeWidget( int s = 10, TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/doc/html/lineedits-example.html b/doc/html/lineedits-example.html
index 66611cf2..90455fa7 100644
--- a/doc/html/lineedits-example.html
+++ b/doc/html/lineedits-example.html
@@ -57,7 +57,7 @@ class TQComboBox;
 
 class LineEdits : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LineEdits( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html
index 7407656b..97645ddf 100644
--- a/doc/html/linguist-manual-4.html
+++ b/doc/html/linguist-manual-4.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 
           button = new TQPushButton( tr("&Quit"), this);
 
      
-
      All TQObject subclasses that use the Q_OBJECT macro implement the tr() function.
      
+
      All TQObject subclasses that use the TQ_OBJECT macro implement the tr() function.
      
 
      Although the tr() call is normally made directly since it is usually called as a member function of a TQObject subclass, in other cases an explicit class name can be supplied, for example:
      
 
           TQPushButton::tr("&Quit")
@@ -315,7 +315,7 @@ TRANSLATIONS    = tt2_fr.ts \
 
      In arrowpad.h we define the ArrowPad subclass which is a subclass of TQWidget. In the Tutorial 2 Screenshot, English version, above, the central widget with the four buttons is an ArrowPad.
      
 
          class ArrowPad : public TQGrid
 
      
- 
      When lupdate is run it not only extracts the source texts but it also groups them into contexts. A context is the name of the class in which the source text appears. Thus, in this example, "ArrowPad" is a context: it is the context of the texts in the ArrowPad class. The Q_OBJECT macro defines tr(x) in ArrowPad like this
      
+ 
      When lupdate is run it not only extracts the source texts but it also groups them into contexts. A context is the name of the class in which the source text appears. Thus, in this example, "ArrowPad" is a context: it is the context of the texts in the ArrowPad class. The TQ_OBJECT macro defines tr(x) in ArrowPad like this
      
 
           qApp->translate( "ArrowPad", x )
 
      
@@ -327,11 +327,11 @@ TRANSLATIONS    = tt2_fr.ts \
 
      
 
      
 
      Tutorial 2 Screenshot, English version
      
-
          class MainWindow : public TQMainWindow
+
          class MainWindow : public TQMainWindow
     {
-        Q_OBJECT
+        TQ_OBJECT
 
      
- 
      In the Tutorial 2 Screenshot, English version, above, the whole window is a MainWindow. This is defined in the mainwindow.h header file. Here too, we use Q_OBJECT, so that MainWindow will become a context in TQt Linguist.
      
+ 
      In the Tutorial 2 Screenshot, English version, above, the whole window is a MainWindow. This is defined in the mainwindow.h header file. Here too, we use TQ_OBJECT, so that MainWindow will become a context in TQt Linguist.
      
 
      In the implementation of MainWindow, mainwindow.cpp, we create an instance of our ArrowPad class
      
 
              ArrowPad *ap = new ArrowPad( this, "arrow pad" );
 
      
@@ -426,9 +426,9 @@ TRANSLATIONS    = tt3_pt.ts
 
      The PrintPanel is defined in printpanel.h.
      
 
          class PrintPanel : public TQVBox
     {
-        Q_OBJECT
+        TQ_OBJECT
 
      
- 
      PrintPanel is a TQWidget. It needs the Q_OBJECT macro for tr() to work properly.
      
+ 
      PrintPanel is a TQWidget. It needs the TQ_OBJECT macro for tr() to work properly.
      
 
      The implementation file is printpanel.cpp.
      
 
          /*
         TQLabel *lab = new TQLabel( tr("<b>TROLL PRINT</b>"), this );
diff --git a/doc/html/listbox-example.html b/doc/html/listbox-example.html
index c796229e..1e1a4f87 100644
--- a/doc/html/listbox-example.html
+++ b/doc/html/listbox-example.html
@@ -60,7 +60,7 @@ class TQButtonGroup;
 
 class ListBoxDemo: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ListBoxDemo();
     ~ListBoxDemo();
diff --git a/doc/html/listboxcombo-example.html b/doc/html/listboxcombo-example.html
index ffe8ba07..a70a7ce3 100644
--- a/doc/html/listboxcombo-example.html
+++ b/doc/html/listboxcombo-example.html
@@ -57,7 +57,7 @@ class TQLabel;
 
 class ListBoxCombo : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListBoxCombo( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/listviews-example.html b/doc/html/listviews-example.html
index 04569ba6..e7600194 100644
--- a/doc/html/listviews-example.html
+++ b/doc/html/listviews-example.html
@@ -120,7 +120,7 @@ protected:
 
 class Folder : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Folder( Folder *parent, const TQString &name );
@@ -179,7 +179,7 @@ protected:
 
 class ListViews : public TQSplitter
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListViews( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/mail-example.html b/doc/html/mail-example.html
index 1598c109..e5200c75 100644
--- a/doc/html/mail-example.html
+++ b/doc/html/mail-example.html
@@ -60,7 +60,7 @@ class TQDns;
 
 class Smtp : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Smtp( const TQString &from, const TQString &to,
diff --git a/doc/html/mdi-example.html b/doc/html/mdi-example.html
index 13833b94..48022b47 100644
--- a/doc/html/mdi-example.html
+++ b/doc/html/mdi-example.html
@@ -62,7 +62,7 @@ class TQMovie;
 
 class MDIWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MDIWindow( TQWidget* parent, const char* name, int wflags );
     ~MDIWindow();
@@ -87,7 +87,7 @@ private:
 
 class ApplicationWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ApplicationWindow();
     ~ApplicationWindow();
diff --git a/doc/html/menu-example.html b/doc/html/menu-example.html
index b611166c..6b17e6b4 100644
--- a/doc/html/menu-example.html
+++ b/doc/html/menu-example.html
@@ -58,7 +58,7 @@ context menu.
 
 class MenuExample : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MenuExample( TQWidget *parent=0, const char *name=0 );
 
@@ -225,7 +225,7 @@ private:
     TQPixmap p2( p2_xpm );
     TQPixmap p3( p3_xpm );
     TQPopupMenu *print = new TQPopupMenu( this );
-    Q_CHECK_PTR( print );
+    TQ_CHECK_PTR( print );
     print->insertTearOffHandle();
     print->insertItem( "&Print to printer", this, SLOT(printer()) );
     print->insertItem( "Print to &file", this, SLOT(file()) );
@@ -234,7 +234,7 @@ private:
     print->insertItem( "Printer &Setup", this, SLOT(printerSetup()) );
 
     TQPopupMenu *file = new TQPopupMenu( this );
-    Q_CHECK_PTR( file );
+    TQ_CHECK_PTR( file );
     file->insertItem( p1, "&Open",  this, SLOT(open()), CTRL+Key_O );
     file->insertItem( p2, "&New", this, SLOT(news()), CTRL+Key_N );
     file->insertItem( p3, "&Save", this, SLOT(save()), CTRL+Key_S );
@@ -245,14 +245,14 @@ private:
     file->insertItem( "E&xit",  qApp, SLOT(quit()), CTRL+Key_Q );
 
     TQPopupMenu *edit = new TQPopupMenu( this );
-    Q_CHECK_PTR( edit );
+    TQ_CHECK_PTR( edit );
     int undoID = edit->insertItem( "&Undo", this, SLOT(undo()) );
     int redoID = edit->insertItem( "&Redo", this, SLOT(redo()) );
     edit->setItemEnabled( undoID, FALSE );
     edit->setItemEnabled( redoID, FALSE );
 
     TQPopupMenu* options = new TQPopupMenu( this );
-    Q_CHECK_PTR( options );
+    TQ_CHECK_PTR( options );
     options->insertTearOffHandle();
     options->setCaption("Options");
     options->insertItem( "&Normal Font", this, SLOT(normal()) );
@@ -276,13 +276,13 @@ private:
 
 
     TQPopupMenu *help = new TQPopupMenu( this );
-    Q_CHECK_PTR( help );
+    TQ_CHECK_PTR( help );
     help->insertItem( "&About", this, SLOT(about()), CTRL+Key_H );
     help->insertItem( "About &TQt", this, SLOT(aboutTQt()) );
 
     // If we used a TQMainWindow we could use its built-in menuBar().
     menu = new TQMenuBar( this );
-    Q_CHECK_PTR( menu );
+    TQ_CHECK_PTR( menu );
     menu->insertItem( "&File", file );
     menu->insertItem( "&Edit", edit );
     menu->insertItem( "&Options", options );
@@ -292,7 +292,7 @@ private:
 
 
     TQLabel *msg = new TQLabel( this );
-    Q_CHECK_PTR( msg );
+    TQ_CHECK_PTR( msg );
     msg->setText( "A context menu is available.\n"
                   "Invoke it by right-clicking or by"
                   " pressing the 'context' button." );
@@ -300,7 +300,7 @@ private:
     msg->setAlignment( AlignCenter );
 
     label = new TQLabel( this );
-    Q_CHECK_PTR( label );
+    TQ_CHECK_PTR( label );
     label->setGeometry( 20, rect().center().y()-20, width()-40, 40 );
     label->setFrameStyle( TQFrame::Box | TQFrame::Raised );
     label->setLineWidth( 1 );
@@ -317,7 +317,7 @@ private:
 void MenuExample::contextMenuEvent( TQContextMenuEvent * )
 {
     TQPopupMenu* contextMenu = new TQPopupMenu( this );
-    Q_CHECK_PTR( contextMenu );
+    TQ_CHECK_PTR( contextMenu );
     TQLabel *caption = new TQLabel( "<font color=darkblue><u><b>"
         "Context Menu</b></u></font>", this );
     caption->setAlignment( TQt::AlignCenter );
@@ -326,7 +326,7 @@ private:
     contextMenu->insertItem( "&Open...", this, SLOT(open()), CTRL+Key_O );
     contextMenu->insertItem( "&Save", this, SLOT(save()), CTRL+Key_S );
     TQPopupMenu *submenu = new TQPopupMenu( this );
-    Q_CHECK_PTR( submenu );
+    TQ_CHECK_PTR( submenu );
     submenu->insertItem( "&Print to printer", this, SLOT(printer()) );
     submenu->insertItem( "Print to &file", this, SLOT(file()) );
     submenu->insertItem( "Print to fa&x", this, SLOT(fax()) );
diff --git a/doc/html/metaobjects.html b/doc/html/metaobjects.html
index e4e804b7..4a4ec910 100644
--- a/doc/html/metaobjects.html
+++ b/doc/html/metaobjects.html
@@ -33,21 +33,21 @@ body { background: #ffffff; color: black; }
 
 
 
-
       
+
       
 
       TQt's Meta Object System provides the signals and slots mechanism for
 inter-object communication, runtime type information, and the dynamic
 property system.
 
       The Meta Object System is based on three things:
 
        
 
      1.  the TQObject class;
-
      2.  the Q_OBJECT macro inside the private section of the class
+
      3.  the TQ_OBJECT macro inside the private section of the class
 declaration;
 
      4.  the Meta Object Compiler (moc). 
 
      
 
       The moc reads a C++ source file. If it finds one or more class
-declarations that contain the Q_OBJECT macro, it produces another C++
+declarations that contain the TQ_OBJECT macro, it produces another C++
 source file which contains the meta object code for the classes that
-contain the Q_OBJECT macro. This generated source file is either
+contain the TQ_OBJECT macro. This generated source file is either
 #included into the class's source file or compiled and linked with the
 class's implementation.
 
       In addition to providing the signals and
@@ -73,14 +73,14 @@ returns the associated meta object for the
 class.
 
       
    
 
     While it is possible to use TQObject as a base class without the
-Q_OBJECT macro and without meta object code, neither signals and slots
+TQ_OBJECT macro and without meta object code, neither signals and slots
 nor the other features described here will be available if the
-Q_OBJECT macro is not used. From the meta object system's point of
+TQ_OBJECT macro is not used. From the meta object system's point of
 view, a TQObject subclass without meta code is equivalent to its
 closest ancestor with meta object code. This means for example, that
 className() will not return the actual name of your class, but the
 class name of this ancestor. We strongly recommend that all
-subclasses of TQObject use the Q_OBJECT macro regardless of whether
+subclasses of TQObject use the TQ_OBJECT macro regardless of whether
 they actually use signals, slots and properties or not.
 
     
 
diff --git a/doc/html/moc.html b/doc/html/moc.html
index bbc07e57..ba6c33df 100644
--- a/doc/html/moc.html
+++ b/doc/html/moc.html
@@ -37,9 +37,9 @@ body { background: #ffffff; color: black; }
 
     The Meta Object Compiler, moc among friends, is the program which
 handles TQt's C++ extensions.
 
     The moc reads a C++ source file. If it finds one or more class
-declarations that contain the Q_OBJECT macro, it produces another
+declarations that contain the TQ_OBJECT macro, it produces another
 C++ source file which contains the meta object code for the classes
-that use the Q_OBJECT macro. Among other things, meta object code is
+that use the TQ_OBJECT macro. Among other things, meta object code is
 required for the signal/slot mechanism, runtime type information and
 the dynamic property system.
 
     The C++ source file generated by the moc must be compiled and linked
@@ -57,7 +57,7 @@ like this:
 
     
         class MyClass : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         MyClass( TQObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -82,7 +82,7 @@ function setPriority().
 
     
         class MyClass : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( Priority priority READ priority WRITE setPriority )
         Q_ENUMS( Priority )
     public:
@@ -102,7 +102,7 @@ attach additional name/value-pairs to the class' meta object:
 
     
         class MyClass : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_CLASSINFO( "Author", "Oscar Peterson")
         Q_CLASSINFO( "Status", "Active")
     public:
@@ -144,7 +144,7 @@ it is not necessary to compile and link it separately, as in Method A.
 
     
 
     Method A is the normal method. Method B can be used in cases where you
 want the implementation file to be self-contained, or in cases where
-the Q_OBJECT class is implementation-internal and thus should not be
+the TQ_OBJECT class is implementation-internal and thus should not be
 visible in the header file.
 
     
     Automating moc Usage with Makefiles
 
    
@@ -157,7 +157,7 @@ recognizes both Method A and B style source files, and generates a
 Makefile that does all the necessary moc handling.
 
     If you want to create your Makefiles yourself, here are some tips on
 how to include moc handling.
-
     For Q_OBJECT class declarations in header files, here is a useful
+
     For TQ_OBJECT class declarations in header files, here is a useful
 makefile rule if you only use GNU make:
 
     
         moc_%.cpp: %.h
@@ -177,7 +177,7 @@ following form:
 
     (While we prefer to name our C++ source files .cpp, the moc doesn't
 care, so you can use .C, .cc, .CC, .cxx or even .c++ if you
 prefer.)
-
     For Q_OBJECT class declarations in implementation (.cpp) files, we
+
     For TQ_OBJECT class declarations in implementation (.cpp) files, we
 suggest a makefile rule like this:
 
     
         NAME.o: NAME.moc
@@ -240,7 +240,7 @@ MOC_SKIP_END.
 
     
     Diagnostics
 
    
 
     The moc will warn you about a number of dangerous or illegal
-constructs in the Q_OBJECT class declarations.
+constructs in the TQ_OBJECT class declarations.
 
     If you get linkage errors in the final building phase of your
 program, saying that YourClass::className() is undefined or that
 YourClass lacks a vtbl, something has been done wrong. Most often,
@@ -255,7 +255,7 @@ not usually a problem in practice.
 templates cannot have signals or slots. Here is an example:
 
     
         class SomeTemplate<int> : public TQFrame {
-        Q_OBJECT
+        TQ_OBJECT
         ...
     signals:
         void bugInMocDetected( int );
@@ -286,7 +286,7 @@ signal/slot arguments, we think inheritance is a better alternative.
 Here is an example of illegal syntax:
 
     
         class SomeClass : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
         ...
     public slots:
         // illegal
@@ -299,7 +299,7 @@ Here is an example of illegal syntax:
     typedef void (*ApplyFunctionType)( List *, void * );
 
     class SomeClass : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
         ...
     public slots:
         void apply( ApplyFunctionType, char * );
@@ -316,7 +316,7 @@ protected or public sections instead.  Here is an example of the
 illegal syntax:
 
     
         class SomeClass : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
         ...
     signals:
         friend class ClassTemplate<char>; // WRONG
@@ -371,7 +371,7 @@ signals or slots
 
     Here's an example:
 
     
         class A {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         class B {
         public slots:   // WRONG
@@ -395,7 +395,7 @@ protected or public sections, where they belong.  Here is an example
 of the illegal syntax:
 
     
         class SomeClass : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
     public slots:
         SomeClass( TQObject *parent, const char *name )
             : TQObject( parent, name ) { } // WRONG
@@ -413,7 +413,7 @@ find the functions nor resolve the type. Here is an example of the
 illegal syntax:
 
     
         class SomeClass : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         ...
         Q_PROPERTY( Priority priority READ priority WRITE setPriority ) // WRONG
@@ -426,10 +426,10 @@ illegal syntax:
 
    
  
 
     Work around this limitation by declaring all properties at the
-beginning of the class declaration, right after Q_OBJECT:
+beginning of the class declaration, right after TQ_OBJECT:
 
     
         class SomeClass : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( Priority priority READ priority WRITE setPriority )
         Q_ENUMS( Priority )
     public:
diff --git a/doc/html/movies-example.html b/doc/html/movies-example.html
index 7c254423..da55fea6 100644
--- a/doc/html/movies-example.html
+++ b/doc/html/movies-example.html
@@ -59,7 +59,7 @@ The Movies example displays MNG and animated GIF files using the TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
     TQMovie movie;
     TQString filename;
     TQSize sh;
@@ -259,7 +259,7 @@ public:
 // A TQFileDialog that chooses movies.
 //
 class MovieStarter: public TQFileDialog {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MovieStarter(const char *dir);
 
diff --git a/doc/html/networkprotocol-example.html b/doc/html/networkprotocol-example.html
index 08722569..12f5c972 100644
--- a/doc/html/networkprotocol-example.html
+++ b/doc/html/networkprotocol-example.html
@@ -57,7 +57,7 @@ should not be used as a real NNTP implemention.
 
 class Nntp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Nntp();
diff --git a/doc/html/ntqapplication.html b/doc/html/ntqapplication.html
index 2df65894..ef34d5a9 100644
--- a/doc/html/ntqapplication.html
+++ b/doc/html/ntqapplication.html
@@ -178,7 +178,7 @@ flow and main settings.
 
  • void qFatal ( const char * msg, ... )
    • 
 
  • void qSystemWarning ( const char * msg, int code )
    • 
 
  • void Q_ASSERT ( bool test )
    • 
-
  • void Q_CHECK_PTR ( void * p )
    • 
+
  • void TQ_CHECK_PTR ( void * p )
    • 
 
  • TQtMsgHandler qInstallMsgHandler ( TQtMsgHandler h )
    • 
 
 
    Detailed Description
    
@@ -1808,7 +1808,7 @@ message using the qWarning() function:
  
 
     
    See also qWarning() and Debugging.
 
-
    void Q_CHECK_PTR ( void * p )
+
    void TQ_CHECK_PTR ( void * p )
 
    
 
 
     
@@ -1819,10 +1819,10 @@ name and line number, saying that the program ran out of memory.
 
             int *a;
 
-        Q_CHECK_PTR( a = new int[80] );  // WRONG!
+        TQ_CHECK_PTR( a = new int[80] );  // WRONG!
 
         a = new (nothrow) int[80];       // Right
-        Q_CHECK_PTR( a );
+        TQ_CHECK_PTR( a );
     
    
  
 
     
    See also qWarning() and Debugging.
@@ -2004,9 +2004,9 @@ defined.
 
 
     Returns the TQt version number as a string, for example, "2.3.0" or
 "3.0.5".
-
     The QT_VERSION define has the numeric value in the form:
+
     The TQT_VERSION define has the numeric value in the form:
 0xmmiibb (m = major, i = minor, b = bugfix). For example, TQt
-3.0.5's QT_VERSION is 0x030005.
+3.0.5's TQT_VERSION is 0x030005.
 
 
    void qWarning ( const char * msg, ... )
 
    
diff --git a/doc/html/ntqfile.html b/doc/html/ntqfile.html
index 2c5612b0..58efb3bc 100644
--- a/doc/html/ntqfile.html
+++ b/doc/html/ntqfile.html
@@ -352,7 +352,7 @@ Returns TRUE if successful, otherwise FALSE.
     {
         TQFile f;
         f.open( IO_WriteOnly, stderr );
-        f.writeBlock( msg, qstrlen(msg) );      // write to stderr
+        f.writeBlock( msg, tqstrlen(msg) );      // write to stderr
         f.close();
     }
   
    
diff --git a/doc/html/ntqobject.html b/doc/html/ntqobject.html
index 2adf28d9..a146ae64 100644
--- a/doc/html/ntqobject.html
+++ b/doc/html/ntqobject.html
@@ -147,7 +147,7 @@ details. A convenience handler, childEvent(), can be r
 to catch child events.
 
     Last but not least, TQObject provides the basic timer support in
 TQt; see TQTimer for high-level support for timers.
-
     Notice that the Q_OBJECT macro is mandatory for any object that
+
     Notice that the TQ_OBJECT macro is mandatory for any object that
 implements signals, slots or properties. You also need to run the
 moc program (Meta Object Compiler) on the
 source file. We strongly recommend the use of this macro in all
@@ -270,7 +270,7 @@ in the list.
 
     This function is generated by the Meta
     Object Compiler.
 
     Warning: This function will return the wrong name if the class
-definition lacks the Q_OBJECT macro.
+definition lacks the TQ_OBJECT macro.
 
     
    See also name, inherits(), isA(), and isWidgetType().
 
 
    Example: sql/overview/custom1/main.cpp.
@@ -298,7 +298,7 @@ label,  SLOT(setNum(int v)) );
 
     
         class MyWidget : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         MyWidget();
 
@@ -684,7 +684,7 @@ by you, which is often not what you want. We recommend using a
 
     Returns a pointer to the meta object of this object.
 
     A meta object contains information about a class that inherits
 TQObject, e.g. class name, superclass name, properties, signals and
-slots. Every class that contains the Q_OBJECT macro will also have
+slots. Every class that contains the TQ_OBJECT macro will also have
 a meta object.
 
     The meta object information is required by the signal/slot
 connection mechanism and the property system. The functions isA()
@@ -841,7 +841,7 @@ used to find out which timer was activated.
 
         class MyObject : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         MyObject( TQObject *parent = 0, const char *name = 0 );
 
@@ -887,7 +887,7 @@ functionality, and also more general information about timers.
 
     Returns a translated version of sourceText, or sourceText
 itself if there is no appropriate translated version. The
 translation context is TQObject with comment (0 by default).
-All TQObject subclasses using the Q_OBJECT macro automatically have
+All TQObject subclasses using the TQ_OBJECT macro automatically have
 a reimplementation of this function with the subclass name as
 context.
 
     Warning: This method is reentrant only if all translators are
diff --git a/doc/html/ntqspinbox.html b/doc/html/ntqspinbox.html
index 02b33495..7ab4c8cd 100644
--- a/doc/html/ntqspinbox.html
+++ b/doc/html/ntqspinbox.html
@@ -162,7 +162,7 @@ the range of integers used inside the program would be -1 to 100:
 
     
             class MySpinBox : public TQSpinBox
         {
-            Q_OBJECT
+            TQ_OBJECT
         public:
             ...
 
diff --git a/doc/html/ntqvaluelist.html b/doc/html/ntqvaluelist.html
index b6ab42c6..b40c1037 100644
--- a/doc/html/ntqvaluelist.html
+++ b/doc/html/ntqvaluelist.html
@@ -217,7 +217,7 @@ returned by end().
 
     
         TQValueList<int> list;
     ...
-    TQValueList<int>::iterator it = qFind( list.begin(), list.end(), 3 );
+    TQValueList<int>::iterator it = tqFind( list.begin(), list.end(), 3 );
     if ( it != list.end() )
         // it points to the found item
     
    
diff --git a/doc/html/ntqvaluevector.html b/doc/html/ntqvaluevector.html
index cb723597..ec0e812a 100644
--- a/doc/html/ntqvaluevector.html
+++ b/doc/html/ntqvaluevector.html
@@ -239,7 +239,7 @@ For example:
 
     
         TQValueVector<int> vec;
     ...
-    TQValueVector<int>::const_iterator it = qFind( vec.begin(), vec.end(), 3 );
+    TQValueVector<int>::const_iterator it = tqFind( vec.begin(), vec.end(), 3 );
     if ( it != vector.end() )
         // 'it' points to the found element
     
    
diff --git a/doc/html/outliner-example.html b/doc/html/outliner-example.html
index 38fe21f5..ba5b51fe 100644
--- a/doc/html/outliner-example.html
+++ b/doc/html/outliner-example.html
@@ -117,7 +117,7 @@ traverse it.
 
 class OutlineTree : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     OutlineTree( const TQString fileName, TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/popup-example.html b/doc/html/popup-example.html
index acff96e2..ec60e3c0 100644
--- a/doc/html/popup-example.html
+++ b/doc/html/popup-example.html
@@ -59,7 +59,7 @@ pop up.
 
 class FancyPopup : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FancyPopup( TQWidget* parent = 0, const char*  name=0);
 
@@ -77,7 +77,7 @@ private:
 
  class Frame : public TQFrame
  {
-     Q_OBJECT
+     TQ_OBJECT
  public:
      Frame( TQWidget *parent=0, const char*  name=0);
 
diff --git a/doc/html/porting.html b/doc/html/porting.html
index c5058a8b..39062649 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -222,7 +222,7 @@ but source compatibility should not be affected if the macro variable
 QT_CLEAN_NAMESPACE is not defined:
 
     
      
 
    •  ASSERT becomes Q_ASSERT
-
    •  CHECK_PTR becomes Q_CHECK_PTR
+
    •  CHECK_PTR becomes TQ_CHECK_PTR
 
    
 
     For the record, undocumented macro variables that are not part of the API
 have been changed:
@@ -386,10 +386,10 @@ new code.
 
 
     Additionally, these preprocessor directives have been removed:
 
     
      
-
    •  #define strlen qstrlen
+
    •  #define strlen tqstrlen
 
    •  #define strcpy qstrcpy
 
    •  #define strcmp qstrcmp
-
    •  #define strncmp qstrncmp
+
    •  #define strncmp tqstrncmp
 
    •  #define stricmp qstricmp
 
    •  #define strnicmp qstrnicmp
 
    
diff --git a/doc/html/process-example.html b/doc/html/process-example.html
index 8949c674..d3b8ef8c 100644
--- a/doc/html/process-example.html
+++ b/doc/html/process-example.html
@@ -61,7 +61,7 @@ output of the command.
 
 class UicManager : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     UicManager();
diff --git a/doc/html/progress-example.html b/doc/html/progress-example.html
index 009b4dab..a5ae52bc 100644
--- a/doc/html/progress-example.html
+++ b/doc/html/progress-example.html
@@ -160,7 +160,7 @@ private:
 
 class CPUWaster : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     enum { first_draw_item = 1000, last_draw_item = 1006 };
 
@@ -183,10 +183,10 @@ public:
         pb(0)
     {
         menubar = new TQMenuBar( this, "menu" );
-        Q_CHECK_PTR( menubar );
+        TQ_CHECK_PTR( menubar );
 
         TQPopupMenu* file = new TQPopupMenu();
-        Q_CHECK_PTR( file );
+        TQ_CHECK_PTR( file );
         menubar->insertItem( "&File", file );
         for (int i=first_draw_item; i<=last_draw_item; i++)
             file->insertItem( drawItemText(i), i );
@@ -195,7 +195,7 @@ public:
         file->insertItem( "Quit", qApp,  SLOT(quit()) );
 
         options = new TQPopupMenu();
-        Q_CHECK_PTR( options );
+        TQ_CHECK_PTR( options );
         menubar->insertItem( "&Options", options );
         td_id = options->insertItem( "Timer driven", this, SLOT(timerDriven()) );
         ld_id = options->insertItem( "Loop driven", this, SLOT(loopDriven()) );
diff --git a/doc/html/progressbar-example.html b/doc/html/progressbar-example.html
index dc54be1d..02b4b901 100644
--- a/doc/html/progressbar-example.html
+++ b/doc/html/progressbar-example.html
@@ -58,7 +58,7 @@ class TQProgressBar;
 
 class ProgressBar : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ProgressBar( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/properties.html b/doc/html/properties.html
index bba5d99c..c40fbaf0 100644
--- a/doc/html/properties.html
+++ b/doc/html/properties.html
@@ -88,7 +88,7 @@ functions in use:
 
     
         class MyClass : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         MyClass( TQObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -132,7 +132,7 @@ final class declaration including the property related declarations:
 
     
         class MyClass : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( Priority priority READ priority WRITE setPriority )
         Q_ENUMS( Priority )
     public:
diff --git a/doc/html/qaccel-h.html b/doc/html/qaccel-h.html
index 77cbf04a..001e2a47 100644
--- a/doc/html/qaccel-h.html
+++ b/doc/html/qaccel-h.html
@@ -88,7 +88,7 @@ class TQAccelPrivate;
 
 class Q_EXPORT TQAccel : public TQObject			// accelerator class
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQAccel( TQWidget *parent, const char *name=0 );
     TQAccel( TQWidget* watch, TQObject *parent, const char *name=0 );
@@ -134,7 +134,7 @@ private:
     TQAccelPrivate * d;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQAccel( const TQAccel & );
     TQAccel &operator=( const TQAccel & );
 #endif
diff --git a/doc/html/qaction-application-example.html b/doc/html/qaction-application-example.html
index d028aa83..89c4f889 100644
--- a/doc/html/qaction-application-example.html
+++ b/doc/html/qaction-application-example.html
@@ -60,7 +60,7 @@ class TQTextEdit;
 
 class ApplicationWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ApplicationWindow();
diff --git a/doc/html/qaction-h.html b/doc/html/qaction-h.html
index e08e6388..df70a1ed 100644
--- a/doc/html/qaction-h.html
+++ b/doc/html/qaction-h.html
@@ -94,7 +94,7 @@ class TQToolTipGroup;
 
 class Q_EXPORT TQAction : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction)
     Q_PROPERTY( bool on READ isOn WRITE setOn )
     Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
@@ -181,7 +181,7 @@ private:
     friend class TQActionGroupPrivate;
     TQActionPrivate* d;
 
-#if defined(Q_DISABLE_COPY)  // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY)  // Disabled copy constructor and operator=
     TQAction( const TQAction & );
     TQAction &operator=( const TQAction & );
 #endif
@@ -189,7 +189,7 @@ private:
 
 class Q_EXPORT TQActionGroup : public TQAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
     Q_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown )
 
@@ -243,7 +243,7 @@ public:
 #endif
 
 private:
-#if defined(Q_DISABLE_COPY)  // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY)  // Disabled copy constructor and operator=
     TQActionGroup( const TQActionGroup & );
     TQActionGroup &operator=( const TQActionGroup & );
 #endif
diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html
index b6fb2270..858534ed 100644
--- a/doc/html/qapplication-h.html
+++ b/doc/html/qapplication-h.html
@@ -105,7 +105,7 @@ extern Q_EXPORT TQApplication *qApp;		// global application object
 
 class Q_EXPORT TQApplication : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQApplication( int &argc, char **argv );
     TQApplication( int &argc, char **argv, bool GUIenabled );
@@ -451,7 +451,7 @@ private:
     friend class TQInputContext;
 #endif
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQApplication( const TQApplication & );
     TQApplication &operator=( const TQApplication & );
 #endif
diff --git a/doc/html/qassistantclient-h.html b/doc/html/qassistantclient-h.html
index 40439237..a703019c 100644
--- a/doc/html/qassistantclient-h.html
+++ b/doc/html/qassistantclient-h.html
@@ -76,7 +76,7 @@ class TQProcess;
 
 class TQAssistantClient : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool open READ isOpen )
 
 public:
diff --git a/doc/html/qasyncio-h.html b/doc/html/qasyncio-h.html
index 074ebba6..627fae60 100644
--- a/doc/html/qasyncio-h.html
+++ b/doc/html/qasyncio-h.html
@@ -137,7 +137,7 @@ public:
 };
 
 class Q_EXPORT TQDataPump : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
     int interval;
     TQTimer timer;
     TQDataSource* source;
diff --git a/doc/html/qaxbindable.html b/doc/html/qaxbindable.html
index aa5ec16d..fe1869ee 100644
--- a/doc/html/qaxbindable.html
+++ b/doc/html/qaxbindable.html
@@ -70,7 +70,7 @@ TQWidget first.
 
     
         class MyActiveX : public TQWidget, public TQAxBindable
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( int value READ value WRITE setValue )
     public:
         MyActiveX( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/qaxobject.html b/doc/html/qaxobject.html
index 5a223322..0c29dce8 100644
--- a/doc/html/qaxobject.html
+++ b/doc/html/qaxobject.html
@@ -70,7 +70,7 @@ COM object directly through the IUnknown pointer.
 organized in an object hierarchy, receive events and connect to
 signals and slots.
 
     Warning:
-You can subclass TQAxObject, but you cannot use the Q_OBJECT macro
+You can subclass TQAxObject, but you cannot use the TQ_OBJECT macro
 in the subclass (the generated moc-file will not compile), so you
 cannot add further signals, slots or properties. This limitation is 
 due to the metaobject information generated in runtime. 
diff --git a/doc/html/qaxscript-h.html b/doc/html/qaxscript-h.html
index fcc15968..f2164444 100644
--- a/doc/html/qaxscript-h.html
+++ b/doc/html/qaxscript-h.html
@@ -113,7 +113,7 @@ private:
 
 class TQAxScript : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum FunctionFlags {
@@ -166,7 +166,7 @@ private:
 
 class TQAxScriptManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQAxScriptManager( TQObject *parent = 0, const char *name = 0 );
diff --git a/doc/html/qaxserver-example-hierarchy.html b/doc/html/qaxserver-example-hierarchy.html
index 1a1ef5f7..eb1cf33e 100644
--- a/doc/html/qaxserver-example-hierarchy.html
+++ b/doc/html/qaxserver-example-hierarchy.html
@@ -39,7 +39,7 @@ subclass with child widgets that are accessible as sub types.
 
 
        class TQParentWidget : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         TQParentWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
 
@@ -85,7 +85,7 @@ name.
 
 
        class TQSubWidget : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_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 1c96259e..4336e29c 100644
--- a/doc/html/qaxserver-example-multiple.html
+++ b/doc/html/qaxserver-example-multiple.html
@@ -43,11 +43,11 @@ the TQAXFACTORY_BEGIN, TQWidget
     {
-        Q_OBJECT
+        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}")
-
    The class declaration includes the Q_OBJECT macro to activate TQt's meta object system, and sets COM identifiers for the class using the 
+
    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 )
     public:
@@ -84,7 +84,7 @@ property using the Q_PROPERTY macro.
 
 
        class TQAxWidget2 : public TQWidget
     {
-        Q_OBJECT
+        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}")
diff --git a/doc/html/qaxserver-example-opengl.html b/doc/html/qaxserver-example-opengl.html
index 1a44d439..6647d8bc 100644
--- a/doc/html/qaxserver-example-opengl.html
+++ b/doc/html/qaxserver-example-opengl.html
@@ -92,7 +92,7 @@ to render OpenGL, and from TQAxBindable.
     class GLBox : public TQGLWidget,
                   public TQAxBindable
     {
-        Q_OBJECT
+        TQ_OBJECT
 
    The class reimplements the TQAxBindable::createAggregate() function from TQAxBindable
 to return the pointer to a TQAxAggregated object.
 
        public:
diff --git a/doc/html/qaxserver-example-simple.html b/doc/html/qaxserver-example-simple.html
index 4917179b..5a8007c6 100644
--- a/doc/html/qaxserver-example-simple.html
+++ b/doc/html/qaxserver-example-simple.html
@@ -46,7 +46,7 @@ and TQAxBindable::propertyChanged
 
     The TQt implementation of the ActiveX for this example is
 
        class TQSimpleAX : public TQWidget, public TQAxBindable
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( TQString text READ text WRITE setText )
         Q_PROPERTY( int value READ value WRITE setValue )
     public:
diff --git a/doc/html/qaxserver.html b/doc/html/qaxserver.html
index 51465119..5b4e1d02 100644
--- a/doc/html/qaxserver.html
+++ b/doc/html/qaxserver.html
@@ -383,10 +383,10 @@ or any existing TQWidget subclass:
 
     class MyActiveX : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     
    
  
-
     The Q_OBJECT macro is required to provide the meta object information
+
     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:
 
     
    @@ -618,7 +618,7 @@ inheritance from the TQAxBindable class:
 
     class MyActiveX : public TQWidget, public TQAxBindable
     {
-        Q_OBJECT
+        TQ_OBJECT
     
    
       
 When implementing the property write functions, use the
@@ -914,7 +914,7 @@ Office applications.
     
         class MyActiveX : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_CLASSINFO("Version", "2.0")
         Q_CLASSINFO("ClassID", "{7a4cffd8-cbcd-4ae9-ae7e-343e1e5710df}")
         Q_CLASSINFO("InterfaceID", "{6fb035bf-8019-48d8-be51-ef05427d8994}")
@@ -945,7 +945,7 @@ macro.
     
         class MyLicensedControl : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_CLASSINFO("LicenseKey", "<key string>")
     ...
     };
@@ -1023,7 +1023,7 @@ a new object of the TQAxAggregated subclass.
     class MyActiveX : public TQWidget,                       
                       public TQAxBindable
     {
-    	Q_OBJECT
+    	TQ_OBJECT
     public:
         MyActiveX( TQWidget *parent, const char *name = 0 );
 
diff --git a/doc/html/qaxwidget.html b/doc/html/qaxwidget.html
index 2f3c5a83..4d96a31c 100644
--- a/doc/html/qaxwidget.html
+++ b/doc/html/qaxwidget.html
@@ -75,7 +75,7 @@ filter. Standard widget properties, e.g. e
 control to implement support for ambient properties like e.g.
 palette or font. TQAxWidget tries to provide the necessary hints.
 
     Warning:
-You can subclass TQAxWidget, but you cannot use the Q_OBJECT macro
+You can subclass TQAxWidget, but you cannot use the TQ_OBJECT macro
 in the subclass (the generated moc-file will not compile), so you
 cannot add further signals, slots or properties. This limitation
 is due to the metaobject information generated in runtime. To work
diff --git a/doc/html/qbuffer-h.html b/doc/html/qbuffer-h.html
index fca0dca9..4b4e9f6f 100644
--- a/doc/html/qbuffer-h.html
+++ b/doc/html/qbuffer-h.html
@@ -119,7 +119,7 @@ private:
     uint  a_inc;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQBuffer( const TQBuffer & );
     TQBuffer &operator=( const TQBuffer & );
 #endif
diff --git a/doc/html/qbutton-h.html b/doc/html/qbutton-h.html
index dd76a7f2..f8a43460 100644
--- a/doc/html/qbutton-h.html
+++ b/doc/html/qbutton-h.html
@@ -91,7 +91,7 @@ class TQButtonData;
 
 class Q_EXPORT TQButton : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ToggleType ToggleState )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
@@ -200,7 +200,7 @@ private:
     void	nextState();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQButton( const TQButton & );
     TQButton &operator=( const TQButton & );
 #endif
diff --git a/doc/html/qbuttongroup-h.html b/doc/html/qbuttongroup-h.html
index 1f7e0c5c..3d3702d5 100644
--- a/doc/html/qbuttongroup-h.html
+++ b/doc/html/qbuttongroup-h.html
@@ -90,7 +90,7 @@ class TQButtonList;
 
 class Q_EXPORT TQButtonGroup : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
     Q_PROPERTY( bool radioButtonExclusive READ isRadioButtonExclusive WRITE setRadioButtonExclusive )
     Q_PROPERTY( int selectedId READ selectedId WRITE setButton )
@@ -145,7 +145,7 @@ private:
     TQButtonList *buttons;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQButtonGroup( const TQButtonGroup & );
     TQButtonGroup &operator=( const TQButtonGroup & );
 #endif
diff --git a/doc/html/qcanvas-h.html b/doc/html/qcanvas-h.html
index 80ff0b83..13336112 100644
--- a/doc/html/qcanvas-h.html
+++ b/doc/html/qcanvas-h.html
@@ -87,7 +87,7 @@ body { background: #ffffff; color: black; }
 #include "ntqpointarray.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
+#if !defined( TQT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
 #define TQM_EXPORT_CANVAS
 #define TQM_TEMPLATE_EXTERN_CANVAS
 #else
@@ -254,7 +254,7 @@ class TQCanvasData;
 
 class TQM_EXPORT_CANVAS TQCanvas : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQCanvas( TQObject* parent = 0, const char* name = 0 );
     TQCanvas(int w, int h);
@@ -389,7 +389,7 @@ private:
 
     friend void qt_unview(TQCanvas* c);
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQCanvas( const TQCanvas & );
     TQCanvas &operator=( const TQCanvas & );
 #endif
@@ -399,7 +399,7 @@ class TQCanvasViewData;
 
 class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0);
@@ -429,7 +429,7 @@ private slots:
     void updateContentsSize();
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQCanvasView( const TQCanvasView & );
     TQCanvasView &operator=( const TQCanvasView & );
 #endif
@@ -453,7 +453,7 @@ public:
     void setOffset(int x, int y) { hotx = x; hoty = y; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasPixmap( const TQCanvasPixmap & );
     TQCanvasPixmap &operator=( const TQCanvasPixmap & );
 #endif
@@ -499,7 +499,7 @@ public:
 	{ return (uint)framecount; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasPixmapArray( const TQCanvasPixmapArray & );
     TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & );
 #endif
@@ -565,7 +565,7 @@ public:
     void draw(TQPainter& painter);
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasSprite( const TQCanvasSprite & );
     TQCanvasSprite &operator=( const TQCanvasSprite & );
 #endif
@@ -822,7 +822,7 @@ protected:
     virtual void draw(TQPainter&);
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasText( const TQCanvasText & );
     TQCanvasText &operator=( const TQCanvasText & );
 #endif
diff --git a/doc/html/qcdestyle-h.html b/doc/html/qcdestyle-h.html
index 96324f73..87eb3f3b 100644
--- a/doc/html/qcdestyle-h.html
+++ b/doc/html/qcdestyle-h.html
@@ -92,7 +92,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TQCDEStyle( bool useHighlightCols = FALSE );
diff --git a/doc/html/qcheckbox-h.html b/doc/html/qcheckbox-h.html
index 88f85337..f3cb9efb 100644
--- a/doc/html/qcheckbox-h.html
+++ b/doc/html/qcheckbox-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQCheckBox : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
     Q_PROPERTY( bool tristate READ isTristate WRITE setTristate )
     Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
@@ -113,7 +113,7 @@ protected:
     void    updateMask();
     bool    hitButton( const TQPoint &pos ) const;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCheckBox( const TQCheckBox & );
     TQCheckBox &operator=( const TQCheckBox & );
 #endif
diff --git a/doc/html/qclipboard-h.html b/doc/html/qclipboard-h.html
index 4b5bf518..5f87a2d0 100644
--- a/doc/html/qclipboard-h.html
+++ b/doc/html/qclipboard-h.html
@@ -88,7 +88,7 @@ class TQMimeSource;
 
 class Q_EXPORT TQClipboard : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 private:
     TQClipboard( TQObject *parent=0, const char *name=0 );
     ~TQClipboard();
@@ -159,7 +159,7 @@ private:
 #endif
 
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQClipboard( const TQClipboard & );
     TQClipboard &operator=( const TQClipboard & );
 #endif
diff --git a/doc/html/qcolordialog-h.html b/doc/html/qcolordialog-h.html
index 38c7d8fb..6705512f 100644
--- a/doc/html/qcolordialog-h.html
+++ b/doc/html/qcolordialog-h.html
@@ -87,7 +87,7 @@ class TQColorDialogPrivate;
 
 class Q_EXPORT TQColorDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static TQColor getColor( const TQColor& init = white, TQWidget* parent=0, const char* name=0 );
@@ -118,7 +118,7 @@ private:	// Disabled copy constructor and operator=
     friend class TQColorDialogPrivate;
     friend class TQColorShower;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQColorDialog( const TQColorDialog & );
     TQColorDialog& operator=( const TQColorDialog & );
 #endif
diff --git a/doc/html/qcombobox-h.html b/doc/html/qcombobox-h.html
index 4e14c3eb..7151e792 100644
--- a/doc/html/qcombobox-h.html
+++ b/doc/html/qcombobox-h.html
@@ -94,7 +94,7 @@ class TQWheelEvent;
 
 class Q_EXPORT TQComboBox : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Policy )
     Q_PROPERTY( bool editable READ editable WRITE setEditable )
     Q_PROPERTY( int count READ count )
@@ -230,7 +230,7 @@ private:
     TQComboBoxData	*d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQComboBox( const TQComboBox & );
     TQComboBox &operator=( const TQComboBox & );
 #endif
diff --git a/doc/html/qcommonstyle-h.html b/doc/html/qcommonstyle-h.html
index 754c54a7..8b9a0efa 100644
--- a/doc/html/qcommonstyle-h.html
+++ b/doc/html/qcommonstyle-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQCommonStyle: public TQStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQCommonStyle();
@@ -160,7 +160,7 @@ public:
 
 private:
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCommonStyle( const TQCommonStyle & );
     TQCommonStyle &operator=( const TQCommonStyle & );
 #endif
diff --git a/doc/html/qcopchannel_qws-h.html b/doc/html/qcopchannel_qws-h.html
index 8e220f12..1c89d100 100644
--- a/doc/html/qcopchannel_qws-h.html
+++ b/doc/html/qcopchannel_qws-h.html
@@ -86,7 +86,7 @@ class TQCopChannelPrivate;
 
 class TQCopChannel : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQCopChannel( const TQCString& channel, TQObject* parent=0, const char* name=0 );
     virtual ~TQCopChannel();
diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html
index dce2fc44..3aeef798 100644
--- a/doc/html/qcstring-h.html
+++ b/doc/html/qcstring-h.html
@@ -93,7 +93,7 @@ Q_EXPORT void *qmemmove( void *dst, const void *src, uint len );
 
 Q_EXPORT char *qstrdup( const char * );
 
-Q_EXPORT inline uint qstrlen( const char *str )
+Q_EXPORT inline uint tqstrlen( const char *str )
 { return str ? (uint)strlen(str) : 0u; }
 
 Q_EXPORT inline char *qstrcpy( char *dst, const char *src )
@@ -107,7 +107,7 @@ Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 )
 			    : ( str1 ? 1 : ( str2 ? -1 : 0 ) );
 }
 
-Q_EXPORT inline int qstrncmp( const char *str1, const char *str2, uint len )
+Q_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len )
 {
     return ( str1 && str2 ) ? strncmp( str1, str2, len )
 			    : ( str1 ? 1 : ( str2 ? -1 : 0 ) );
@@ -157,11 +157,11 @@ typedef TQMemArray<char> TQByteArray;
 
 #ifndef QT_NO_COMPRESS
 Q_EXPORT TQByteArray qCompress( const uchar* data, int nbytes );
-Q_EXPORT TQByteArray qUncompress( const uchar* data, int nbytes );
+Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes );
 Q_EXPORT inline TQByteArray qCompress( const TQByteArray& data)
 { return qCompress( (const uchar*)data.data(), data.size() ); }
-Q_EXPORT inline TQByteArray qUncompress( const TQByteArray& data )
-{ return qUncompress( (const uchar*)data.data(), data.size() ); }
+Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data )
+{ return tqUncompress( (const uchar*)data.data(), data.size() ); }
 #endif
 
 /*****************************************************************************
@@ -288,7 +288,7 @@ inline TQCString &TQCString::operator=( const TQCString &s )
 { return (TQCString&)assign( s ); }
 
 inline TQCString &TQCString::operator=( const char *str )
-{ return (TQCString&)duplicate( str, qstrlen(str)+1 ); }
+{ return (TQCString&)duplicate( str, tqstrlen(str)+1 ); }
 
 inline bool TQCString::isNull() const
 { return data() == 0; }
@@ -297,7 +297,7 @@ inline bool TQCString::isEmpty() const
 { return data() == 0 || *data() == '\0'; }
 
 inline uint TQCString::length() const
-{ return qstrlen( data() ); }
+{ return tqstrlen( data() ); }
 
 inline bool TQCString::truncate( uint pos )
 { return resize(pos+1); }
diff --git a/doc/html/qdatabrowser-h.html b/doc/html/qdatabrowser-h.html
index 14c60cde..4670ca93 100644
--- a/doc/html/qdatabrowser-h.html
+++ b/doc/html/qdatabrowser-h.html
@@ -93,7 +93,7 @@ class TQDataBrowserPrivate;
 
 class Q_EXPORT TQDataBrowser : public TQWidget
 {
-    Q_OBJECT
+    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 )
@@ -201,7 +201,7 @@ private:
     void nav( Nav nav );
     TQDataBrowserPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataBrowser( const TQDataBrowser & );
     TQDataBrowser &operator=( const TQDataBrowser & );
 #endif
diff --git a/doc/html/qdatastream-h.html b/doc/html/qdatastream-h.html
index e1dcdde4..3f3fd641 100644
--- a/doc/html/qdatastream-h.html
+++ b/doc/html/qdatastream-h.html
@@ -156,7 +156,7 @@ private:
     int		 ver;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDataStream( const TQDataStream & );
     TQDataStream &operator=( const TQDataStream & );
 #endif
diff --git a/doc/html/qdatatable-h.html b/doc/html/qdatatable-h.html
index 07a9bd35..3b889883 100644
--- a/doc/html/qdatatable-h.html
+++ b/doc/html/qdatatable-h.html
@@ -87,7 +87,7 @@ body { background: #ffffff; color: black; }
 #include "ntqiconset.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -102,7 +102,7 @@ class TQDataTablePrivate;
 
 class TQM_EXPORT_SQL TQDataTable : public TQTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( TQString nullText READ nullText WRITE setNullText )
     Q_PROPERTY( TQString trueText READ trueText WRITE setTrueText )
@@ -269,7 +269,7 @@ private:
     void         endUpdate();
     TQDataTablePrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataTable( const TQDataTable & );
     TQDataTable &operator=( const TQDataTable & );
 #endif
diff --git a/doc/html/qdataview-h.html b/doc/html/qdataview-h.html
index 45a7248c..41d895c8 100644
--- a/doc/html/qdataview-h.html
+++ b/doc/html/qdataview-h.html
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
 #include "ntqwidget.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -94,7 +94,7 @@ class TQDataViewPrivate;
 
 class TQM_EXPORT_SQL TQDataView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDataView( TQWidget* parent=0, const char* name=0, WFlags fl = 0 );
@@ -114,7 +114,7 @@ public slots:
 private:
     TQDataViewPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataView( const TQDataView & );
     TQDataView &operator=( const TQDataView & );
 #endif
diff --git a/doc/html/qdatetimeedit-h.html b/doc/html/qdatetimeedit-h.html
index 9bb291b7..18755a3c 100644
--- a/doc/html/qdatetimeedit-h.html
+++ b/doc/html/qdatetimeedit-h.html
@@ -87,7 +87,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQDateTimeEditBase : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDateTimeEditBase( TQWidget* parent=0, const char* name=0 )
 	: TQWidget( parent, name ) {}
@@ -102,7 +102,7 @@ public slots:
     virtual void stepDown() = 0;
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDateTimeEditBase( const TQDateTimeEditBase & );
     TQDateTimeEditBase &operator=( const TQDateTimeEditBase & );
 #endif
@@ -112,7 +112,7 @@ class TQDateEditPrivate;
 
 class Q_EXPORT TQDateEdit : public TQDateTimeEditBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Order )
     Q_PROPERTY( Order order READ order WRITE setOrder )
     Q_PROPERTY( TQDate date READ date WRITE setDate )
@@ -182,7 +182,7 @@ private:
     TQString sectionText( int sec ) const;
     TQDateEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDateEdit( const TQDateEdit & );
     TQDateEdit &operator=( const TQDateEdit & );
 #endif
@@ -192,7 +192,7 @@ class TQTimeEditPrivate;
 
 class Q_EXPORT TQTimeEdit : public TQDateTimeEditBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_SETS( Display )
     Q_PROPERTY( TQTime time READ time WRITE setTime )
     Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance )
@@ -265,7 +265,7 @@ private:
     TQString sectionText( int sec );
     TQTimeEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTimeEdit( const TQTimeEdit & );
     TQTimeEdit &operator=( const TQTimeEdit & );
 #endif
@@ -276,7 +276,7 @@ class TQDateTimeEditPrivate;
 
 class Q_EXPORT TQDateTimeEdit : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
 
 public:
@@ -319,7 +319,7 @@ private:
     TQTimeEdit* te;
     TQDateTimeEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDateTimeEdit( const TQDateTimeEdit & );
     TQDateTimeEdit &operator=( const TQDateTimeEdit & );
 #endif
diff --git a/doc/html/qdesktopwidget-h.html b/doc/html/qdesktopwidget-h.html
index 6f6c8c6a..e2c43d5f 100644
--- a/doc/html/qdesktopwidget-h.html
+++ b/doc/html/qdesktopwidget-h.html
@@ -84,7 +84,7 @@ class TQDesktopWidgetPrivate; /* Don't touch! */
 
 class Q_EXPORT TQDesktopWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDesktopWidget();
     ~TQDesktopWidget();
@@ -123,7 +123,7 @@ protected:
 private:
     TQDesktopWidgetPrivate *d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDesktopWidget( const TQDesktopWidget & );
     TQDesktopWidget &operator=( const TQDesktopWidget & );
 #endif
diff --git a/doc/html/qdial-h.html b/doc/html/qdial-h.html
index aa70dbf6..72b15867 100644
--- a/doc/html/qdial-h.html
+++ b/doc/html/qdial-h.html
@@ -89,7 +89,7 @@ class TQDialPrivate;
 
 class Q_EXPORT TQDial: public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
     Q_PROPERTY( bool wrapping READ wrapping WRITE setWrapping )
     Q_PROPERTY( int notchSize READ notchSize )
@@ -177,7 +177,7 @@ private:
     void calcLines();
 
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDial( const TQDial & );
     TQDial &operator=( const TQDial & );
 #endif
diff --git a/doc/html/qdialog-h.html b/doc/html/qdialog-h.html
index 65ad113a..c8d6b6ea 100644
--- a/doc/html/qdialog-h.html
+++ b/doc/html/qdialog-h.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
 #endif // QT_H
 #ifndef QT_NO_DIALOG
 #if 0
-Q_OBJECT
+TQ_OBJECT
 #endif
 
 class TQPushButton;
@@ -91,7 +91,7 @@ class TQDialogPrivate;
 class Q_EXPORT TQDialog : public TQWidget
 {
 friend class TQPushButton;
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
     Q_PROPERTY( bool modal READ isModal WRITE setModal )
 
@@ -167,7 +167,7 @@ private:
     TQDialogPrivate* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDialog( const TQDialog & );
     TQDialog &operator=( const TQDialog & );
 #endif
diff --git a/doc/html/qdns-h.html b/doc/html/qdns-h.html
index 3641c321..9df9446b 100644
--- a/doc/html/qdns-h.html
+++ b/doc/html/qdns-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_DNS
 #else
 #define TQM_EXPORT_DNS Q_EXPORT
@@ -97,7 +97,7 @@ body { background: #ffffff; color: black; }
 class TQDnsPrivate;
 
 class TQM_EXPORT_DNS TQDns: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum RecordType {
 	None,
@@ -189,7 +189,7 @@ private:
 // TQDnsSocket are sockets that are used for DNS lookup
 
 class TQDnsSocket: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
     // note: Private not public.  This class contains NO public API.
 protected:
     TQDnsSocket( TQObject *, const char * );
diff --git a/doc/html/qdockarea-h.html b/doc/html/qdockarea-h.html
index cce144c8..56921563 100644
--- a/doc/html/qdockarea-h.html
+++ b/doc/html/qdockarea-h.html
@@ -98,7 +98,7 @@ class TQDockAreaPrivate;
 
 class Q_EXPORT TQDockAreaLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQDockArea;
 
 public:
@@ -133,7 +133,7 @@ private:
     TQWidget *parentWidget;
     TQValueList<TQRect> lines;
     TQPtrList<TQDockWindow> ls;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDockAreaLayout( const TQDockAreaLayout & );
     TQDockAreaLayout &operator=( const TQDockAreaLayout & );
 #endif
@@ -141,7 +141,7 @@ private:
 
 class Q_EXPORT TQDockArea : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( HandlePosition )
     Q_PROPERTY( Orientation orientation READ orientation )
     Q_PROPERTY( int count READ count )
@@ -208,7 +208,7 @@ private:
     TQDockAreaPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDockArea( const TQDockArea & );
     TQDockArea& operator=( const TQDockArea & );
 #endif
diff --git a/doc/html/qdockwindow-h.html b/doc/html/qdockwindow-h.html
index d72de1c1..4515721d 100644
--- a/doc/html/qdockwindow-h.html
+++ b/doc/html/qdockwindow-h.html
@@ -100,7 +100,7 @@ class TQWindowsXPStyle;
 
 class Q_EXPORT TQDockWindow : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( CloseMode Place )
     Q_PROPERTY( int closeMode READ closeMode  WRITE setCloseMode ) //### this shouldn't be of type int?!
     Q_PROPERTY( bool resizeEnabled READ isResizeEnabled  WRITE setResizeEnabled )
@@ -255,7 +255,7 @@ private:
     TQDockWindowPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDockWindow( const TQDockWindow & );
     TQDockWindow& operator=( const TQDockWindow & );
 #endif
diff --git a/doc/html/qdom-h.html b/doc/html/qdom-h.html
index 31344d9c..042117ed 100644
--- a/doc/html/qdom-h.html
+++ b/doc/html/qdom-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
+#if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
 #define TQM_EXPORT_DOM
 #else
 #define TQM_EXPORT_DOM Q_EXPORT
diff --git a/doc/html/qdragobject-h.html b/doc/html/qdragobject-h.html
index 7adbd4fd..b920c94e 100644
--- a/doc/html/qdragobject-h.html
+++ b/doc/html/qdragobject-h.html
@@ -91,7 +91,7 @@ class TQImageDragData;
 #ifndef QT_NO_MIME
 
 class Q_EXPORT TQDragObject: public TQObject, public TQMimeSource {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDragObject( TQWidget * dragSource = 0, const char * name = 0 );
     virtual ~TQDragObject();
@@ -122,14 +122,14 @@ protected:
 
 private:
     TQDragObjectData * d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDragObject( const TQDragObject & );
     TQDragObject &operator=( const TQDragObject & );
 #endif
 };
 
 class Q_EXPORT TQStoredDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQStoredDragData * d;
 
 public:
@@ -143,14 +143,14 @@ public:
     virtual TQByteArray encodedData(const char*) const;
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQStoredDrag( const TQStoredDrag & );
     TQStoredDrag &operator=( const TQStoredDrag & );
 #endif
 };
 
 class Q_EXPORT TQTextDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQTextDragPrivate* d;
 public:
     TQTextDrag( const TQString &,
@@ -169,14 +169,14 @@ public:
     static bool decode( const TQMimeSource* e, TQString& s, TQCString& subtype );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextDrag( const TQTextDrag & );
     TQTextDrag &operator=( const TQTextDrag & );
 #endif
 };
 
 class Q_EXPORT TQImageDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQImage img;
     TQStrList ofmts;
     TQImageDragData* d;
@@ -196,7 +196,7 @@ public:
     static bool decode( const TQMimeSource* e, TQPixmap& i );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQImageDrag( const TQImageDrag & );
     TQImageDrag &operator=( const TQImageDrag & );
 #endif
@@ -204,7 +204,7 @@ private:
 
 
 class Q_EXPORT TQUriDrag: public TQStoredDrag {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQUriDrag( TQStrList uris, TQWidget * dragSource = 0, const char * name = 0 );
@@ -226,7 +226,7 @@ public:
     static bool decodeLocalFiles( const TQMimeSource* e, TQStringList& i );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQUriDrag( const TQUriDrag & );
     TQUriDrag &operator=( const TQUriDrag & );
 #endif
@@ -234,7 +234,7 @@ private:
 
 class Q_EXPORT TQColorDrag : public TQStoredDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQColor color;
 
 public:
@@ -246,7 +246,7 @@ public:
     static bool decode( TQMimeSource *, TQColor &col );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQColorDrag( const TQColorDrag & );
     TQColorDrag &operator=( const TQColorDrag & );
 #endif
@@ -264,7 +264,7 @@ typedef TQUriDrag TQUrlDrag;
 //
 
 class Q_EXPORT TQDragManager: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     TQDragManager();
@@ -301,7 +301,7 @@ private:
 
     TQPixmap *pm_cursor;
     int n_cursor;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDragManager( const TQDragManager & );
     TQDragManager &operator=( const TQDragManager & );
 #endif
diff --git a/doc/html/qeditorfactory-h.html b/doc/html/qeditorfactory-h.html
index cb4d5505..46bc0953 100644
--- a/doc/html/qeditorfactory-h.html
+++ b/doc/html/qeditorfactory-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqvariant.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -101,7 +101,7 @@ public:
     static void installDefaultFactory( TQEditorFactory * factory);
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQEditorFactory( const TQEditorFactory & );
     TQEditorFactory &operator=( const TQEditorFactory & );
 #endif
diff --git a/doc/html/qerrormessage-h.html b/doc/html/qerrormessage-h.html
index 3d0f5b4d..8e9bb12a 100644
--- a/doc/html/qerrormessage-h.html
+++ b/doc/html/qerrormessage-h.html
@@ -91,7 +91,7 @@ template<class type> class TQDict;
 
 
 class Q_EXPORT TQErrorMessage: public TQDialog {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQErrorMessage( TQWidget* parent, const char* name=0 );
     ~TQErrorMessage();
@@ -114,7 +114,7 @@ private:
 
     bool nextPending();
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQErrorMessage( const TQErrorMessage & );
     TQErrorMessage &operator=( const TQErrorMessage & );
 #endif
diff --git a/doc/html/qeventloop-h.html b/doc/html/qeventloop-h.html
index 8c045795..2e69ef0f 100644
--- a/doc/html/qeventloop-h.html
+++ b/doc/html/qeventloop-h.html
@@ -95,7 +95,7 @@ class TQMutex;
 
 class Q_EXPORT TQEventLoop : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQEventLoop( TQObject *parent = 0, const char *name = 0 );
diff --git a/doc/html/qfd-example.html b/doc/html/qfd-example.html
index 25a4a49b..064e9704 100644
--- a/doc/html/qfd-example.html
+++ b/doc/html/qfd-example.html
@@ -55,7 +55,7 @@ This example program displays all characters of a font.
 class TQSlider;
 
 class FontRowTable : public TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FontRowTable( TQWidget* parent=0, const char* name=0 );
 
@@ -78,7 +78,7 @@ private:
 };
 
 class FontDisplayer : public TQMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FontDisplayer( TQWidget* parent=0, const char* name=0 );
 };
diff --git a/doc/html/qfile-h.html b/doc/html/qfile-h.html
index 51dbff1e..5a45c947 100644
--- a/doc/html/qfile-h.html
+++ b/doc/html/qfile-h.html
@@ -150,7 +150,7 @@ private:
     TQCString	ungetchBuffer;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFile( const TQFile & );
     TQFile &operator=( const TQFile & );
 #endif
diff --git a/doc/html/qfiledialog-h.html b/doc/html/qfiledialog-h.html
index 715f04fc..4594e0f3 100644
--- a/doc/html/qfiledialog-h.html
+++ b/doc/html/qfiledialog-h.html
@@ -105,13 +105,13 @@ class TQFileDialogTQFileListView;
 
 class Q_EXPORT TQFileIconProvider : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQFileIconProvider( TQObject * parent = 0, const char* name = 0 );
     virtual const TQPixmap * pixmap( const TQFileInfo & );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFileIconProvider( const TQFileIconProvider & );
     TQFileIconProvider& operator=( const TQFileIconProvider & );
 #endif
@@ -127,7 +127,7 @@ public:
 
 class Q_EXPORT TQFileDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Mode ViewMode PreviewMode )
     // ##### Why are this read-only properties ?
     Q_PROPERTY( TQString selectedFile READ selectedFile )
@@ -372,7 +372,7 @@ private:
 
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFileDialog( const TQFileDialog & );
     TQFileDialog &operator=( const TQFileDialog & );
 #endif
diff --git a/doc/html/qfileinfo-h.html b/doc/html/qfileinfo-h.html
index 841d7fff..850d750c 100644
--- a/doc/html/qfileinfo-h.html
+++ b/doc/html/qfileinfo-h.html
@@ -155,7 +155,7 @@ public:
 
     bool	permission( int permissionSpec ) const;
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQFileInfo::size() should return TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQIODevice::Offset size()	const;
diff --git a/doc/html/qfontdialog-h.html b/doc/html/qfontdialog-h.html
index b154ecbb..d3adb41b 100644
--- a/doc/html/qfontdialog-h.html
+++ b/doc/html/qfontdialog-h.html
@@ -100,7 +100,7 @@ class TQFontDialogPrivate;
 
 class Q_EXPORT TQFontDialog: public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static TQFont getFont( bool *ok, const TQFont &def,
@@ -137,7 +137,7 @@ private:
     TQFontDialogPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFontDialog( const TQFontDialog & );
     TQFontDialog& operator=( const TQFontDialog & );
 #endif
diff --git a/doc/html/qfontmanager_qws-h.html b/doc/html/qfontmanager_qws-h.html
index dcff1863..50a3e4b3 100644
--- a/doc/html/qfontmanager_qws-h.html
+++ b/doc/html/qfontmanager_qws-h.html
@@ -88,7 +88,7 @@ body { background: #ffffff; color: black; }
 
 class TQFontDef;
 
-class Q_PACKED TQGlyphMetrics {
+class TQ_PACKED TQGlyphMetrics {
 
 public:
     Q_UINT8 linestep;
diff --git a/doc/html/qframe-h.html b/doc/html/qframe-h.html
index eddd5cb1..d68edae7 100644
--- a/doc/html/qframe-h.html
+++ b/doc/html/qframe-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQFrame : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Shape Shadow )
     Q_PROPERTY( int frameWidth READ frameWidth )
     Q_PROPERTY( TQRect contentsRect READ contentsRect )
@@ -167,7 +167,7 @@ private:
 
     void * d;
 private:        // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFrame( const TQFrame & );
     TQFrame &operator=( const TQFrame & );
 #endif
diff --git a/doc/html/qftp-h.html b/doc/html/qftp-h.html
index d52288b9..d38aeb58 100644
--- a/doc/html/qftp-h.html
+++ b/doc/html/qftp-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 #include "ntqnetworkprotocol.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_FTP
 #else
 #define TQM_EXPORT_FTP Q_EXPORT
@@ -97,7 +97,7 @@ class TQFtpCommand;
 
 class TQM_EXPORT_FTP TQFtp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFtp(); // ### TQt 4.0: get rid of this overload
diff --git a/doc/html/qgfxdriverplugin_qws-h.html b/doc/html/qgfxdriverplugin_qws-h.html
index 53391f2b..88c190d9 100644
--- a/doc/html/qgfxdriverplugin_qws-h.html
+++ b/doc/html/qgfxdriverplugin_qws-h.html
@@ -87,7 +87,7 @@ class TQGfxDriverPluginPrivate;
 
 class Q_EXPORT TQGfxDriverPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGfxDriverPlugin();
     ~TQGfxDriverPlugin();
diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html
index 3a6b3751..6a503136 100644
--- a/doc/html/qgl-h.html
+++ b/doc/html/qgl-h.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
 #include "ntqglcolormap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_OPENGL
 #else
 #define TQM_EXPORT_OPENGL Q_EXPORT
@@ -310,7 +310,7 @@ private:	// Disabled copy constructor and operator=
 
 class TQM_EXPORT_OPENGL TQGLWidget : public TQWidget, public TQGL
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGLWidget( TQWidget* parent=0, const char* name=0,
 	       const TQGLWidget* shareWidget = 0, WFlags f=0 );
@@ -403,7 +403,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGLWidget( const TQGLWidget& );
     TQGLWidget& operator=( const TQGLWidget& );
 #endif
diff --git a/doc/html/qglcolormap-h.html b/doc/html/qglcolormap-h.html
index 37710a1a..5c866f49 100644
--- a/doc/html/qglcolormap-h.html
+++ b/doc/html/qglcolormap-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 #include "ntqshared.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_OPENGL
 #else
 #define TQM_EXPORT_OPENGL Q_EXPORT
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index 99ad5295..397f2e4e 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -77,11 +77,11 @@ body { background: #ffffff; color: black; }
 #ifndef TQGLOBAL_H
 #define TQGLOBAL_H
 
-#define QT_VERSION_STR   "3.3.8"
+#define TQT_VERSION_STR   "3.3.8"
 /*
-   QT_VERSION is (major << 16) + (minor << 8) + patch.
+   TQT_VERSION is (major << 16) + (minor << 8) + patch.
  */
-#define QT_VERSION 0x030308
+#define TQT_VERSION 0x030308
 
 /*
    The operating system, must be one of: (Q_OS_x)
@@ -353,7 +353,7 @@ body { background: #ffffff; color: black; }
    members of a packed struct. (Pointers are OK, because then you
    supposedly know what you are doing.) */
 #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
-#    define Q_PACKED __attribute__ ((packed))
+#    define TQ_PACKED __attribute__ ((packed))
 #    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
 #      define Q_NO_PACKED_REFERENCE
 #    endif
@@ -580,8 +580,8 @@ body { background: #ffffff; color: black; }
 #  error "TQt has not been tested with this compiler - talk to qt-bugs@trolltech.com"
 #endif
 
-#ifndef Q_PACKED
-#  define Q_PACKED
+#ifndef TQ_PACKED
+#  define TQ_PACKED
 #endif
 
 
@@ -639,10 +639,10 @@ body { background: #ffffff; color: black; }
    Some classes do not permit copies to be made of an object.
    These classes contains a private copy constructor and operator=
    to disable copying (the compiler gives an error message).
-   Undefine Q_DISABLE_COPY to turn off this checking.
+   Undefine TQ_DISABLE_COPY to turn off this checking.
 */
 
-#define Q_DISABLE_COPY
+#define TQ_DISABLE_COPY
 
 #if defined(__cplusplus)
 
@@ -724,7 +724,7 @@ const bool true = TRUE;
 #define TQMIN(a, b)	((a) < (b) ? (a) : (b))
 #define TQABS(a)	((a) >= 0  ? (a) : -(a))
 
-inline int qRound( double d )
+inline int tqRound( double d )
 {
     return d >= 0.0 ? int(d + 0.5) : int( d - ((int)d-1) + 0.5 ) + ((int)d-1);
 }
@@ -758,13 +758,13 @@ typedef long			Q_LONG;		// word up to 64 bit signed
 typedef unsigned long		Q_ULONG;	// word up to 64 bit unsigned
 #endif
 #if defined(Q_OS_WIN) && !defined(Q_CC_GNU)
-#  define Q_INT64_C(c) 		c ## i64	// signed 64 bit constant
-#  define Q_UINT64_C(c)		c ## ui64	// unsigned 64 bit constant
+#  define TQ_INT64_C(c) 		c ## i64	// signed 64 bit constant
+#  define TQ_UINT64_C(c)		c ## ui64	// unsigned 64 bit constant
 typedef __int64			Q_INT64;	// 64 bit signed
 typedef unsigned __int64	Q_UINT64;	// 64 bit unsigned
 #else
-#  define Q_INT64_C(c) 		c ## LL		// signed 64 bit constant
-#  define Q_UINT64_C(c)		c ## ULL	// unsigned 64 bit constant
+#  define TQ_INT64_C(c) 		c ## LL		// signed 64 bit constant
+#  define TQ_UINT64_C(c)		c ## ULL	// unsigned 64 bit constant
 typedef long long		Q_INT64;	// 64 bit signed
 typedef unsigned long long	Q_UINT64;	// 64 bit unsigned
 #endif
@@ -814,37 +814,37 @@ class TQDataStream;
 #endif
 
 
-#ifndef QT_BUILD_KEY
-#define QT_BUILD_KEY "unspecified"
+#ifndef TQT_BUILD_KEY
+#define TQT_BUILD_KEY "unspecified"
 #endif
 
 // prune to local config
 #include "ntqmodules.h"
-#ifndef QT_MODULE_DIALOGS
+#ifndef TQT_MODULE_DIALOGS
 # define QT_NO_DIALOG
 #endif
-#ifndef QT_MODULE_ICONVIEW
+#ifndef TQT_MODULE_ICONVIEW
 # define QT_NO_ICONVIEW
 #endif
-#ifndef QT_MODULE_WORKSPACE
+#ifndef TQT_MODULE_WORKSPACE
 # define QT_NO_WORKSPACE
 #endif
-#ifndef QT_MODULE_NETWORK
+#ifndef TQT_MODULE_NETWORK
 #define QT_NO_NETWORK
 #endif
-#ifndef QT_MODULE_CANVAS
+#ifndef TQT_MODULE_CANVAS
 # define QT_NO_CANVAS
 #endif
-#ifndef QT_MODULE_TABLE
+#ifndef TQT_MODULE_TABLE
 #define QT_NO_TABLE
 #endif
-#ifndef QT_MODULE_XML
+#ifndef TQT_MODULE_XML
 # define QT_NO_XML
 #endif
-#ifndef QT_MODULE_OPENGL
+#ifndef TQT_MODULE_OPENGL
 # define QT_NO_OPENGL
 #endif
-#if !defined(QT_MODULE_SQL)
+#if !defined(TQT_MODULE_SQL)
 # define QT_NO_SQL
 #endif
 
@@ -895,7 +895,7 @@ class TQDataStream;
 #    define Q_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  elif defined(QT_DLL)		/* use a TQt DLL library */
 #    define Q_EXPORT  __declspec(dllimport)
 #    define Q_TEMPLATEDLL
@@ -906,18 +906,18 @@ class TQDataStream;
 #        define Q_TEMPLATE_EXTERN
 #      endif
 #    endif
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  endif
 #elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
 #  if defined(QT_SHARED)	/* create a TQt shared library */
 #    define Q_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  else
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY 	/* avoid unresolved externals */
 #  endif
 #else
 #  undef QT_MAKEDLL		/* ignore these for other platforms */
@@ -1070,14 +1070,14 @@ Q_EXPORT void fatal( const char *, ... )	// print fatal message and exit
 Q_EXPORT bool qt_check_pointer( bool c, const char *, int );
 
 #if defined(QT_CHECK_NULL)
-#  define Q_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__))
+#  define TQ_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__))
 #else
-#  define Q_CHECK_PTR(p)
+#  define TQ_CHECK_PTR(p)
 #endif
 
 #if !defined(QT_NO_COMPAT)			// compatibility with TQt 2
 #  if !defined(CHECK_PTR)
-#    define CHECK_PTR(x) Q_CHECK_PTR(x)
+#    define CHECK_PTR(x) TQ_CHECK_PTR(x)
 #  endif
 #endif // QT_NO_COMPAT
 
diff --git a/doc/html/qglwidget.html b/doc/html/qglwidget.html
index 4bfed71a..85905d51 100644
--- a/doc/html/qglwidget.html
+++ b/doc/html/qglwidget.html
@@ -117,7 +117,7 @@ paintGL() is called.
 
     
         class MyGLDrawer : public TQGLWidget
     {
-        Q_OBJECT        // must include this if you use TQt signals/slots
+        TQ_OBJECT        // must include this if you use TQt signals/slots
 
     public:
         MyGLDrawer( TQWidget *parent, const char *name )
diff --git a/doc/html/qgrid-h.html b/doc/html/qgrid-h.html
index a0e69950..4c3280e6 100644
--- a/doc/html/qgrid-h.html
+++ b/doc/html/qgrid-h.html
@@ -83,7 +83,7 @@ class TQGridLayout;
 
 class Q_EXPORT TQGrid : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGrid( int n, TQWidget* parent=0, const char* name=0, WFlags f = 0 );
     TQGrid( int n, Orientation orient, TQWidget* parent=0, const char* name=0,
@@ -102,7 +102,7 @@ protected:
 private:
     TQGridLayout *lay;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGrid( const TQGrid & );
     TQGrid& operator=( const TQGrid & );
 #endif
diff --git a/doc/html/qgridview-h.html b/doc/html/qgridview-h.html
index 4338a1dc..873710ef 100644
--- a/doc/html/qgridview-h.html
+++ b/doc/html/qgridview-h.html
@@ -87,7 +87,7 @@ class TQGridViewPrivate;
 
 class Q_EXPORT TQGridView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
     Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
     Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
@@ -137,7 +137,7 @@ private:
     TQGridViewPrivate* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGridView( const TQGridView & );
     TQGridView &operator=( const TQGridView & );
 #endif
diff --git a/doc/html/qgroupbox-h.html b/doc/html/qgroupbox-h.html
index 6598f86b..ad8c3c2a 100644
--- a/doc/html/qgroupbox-h.html
+++ b/doc/html/qgroupbox-h.html
@@ -92,7 +92,7 @@ class TQSpacerItem;
 
 class Q_EXPORT TQGroupBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString title READ title WRITE setTitle )
     Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false )
@@ -189,7 +189,7 @@ private:
     int spac, marg;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGroupBox( const TQGroupBox & );
     TQGroupBox &operator=( const TQGroupBox & );
 #endif
diff --git a/doc/html/qguardedptr-h.html b/doc/html/qguardedptr-h.html
index 375532fe..6040b7f2 100644
--- a/doc/html/qguardedptr-h.html
+++ b/doc/html/qguardedptr-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
 // ### 4.0: rename to something without Private in it. Not really internal.
 class Q_EXPORT TQGuardedPtrPrivate : public TQObject, public TQShared
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGuardedPtrPrivate( TQObject* );
     ~TQGuardedPtrPrivate();
@@ -97,7 +97,7 @@ private slots:
 
 private:
     TQObject* obj;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQGuardedPtrPrivate( const TQGuardedPtrPrivate & );
     TQGuardedPtrPrivate &operator=( const TQGuardedPtrPrivate & );
 #endif
diff --git a/doc/html/qhbox-h.html b/doc/html/qhbox-h.html
index 971aaf39..f0b13c9f 100644
--- a/doc/html/qhbox-h.html
+++ b/doc/html/qhbox-h.html
@@ -86,7 +86,7 @@ class TQBoxLayout;
 
 class Q_EXPORT TQHBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHBox( TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
@@ -101,7 +101,7 @@ protected:
 private:
     TQBoxLayout *lay;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHBox( const TQHBox & );
     TQHBox &operator=( const TQHBox & );
 #endif
diff --git a/doc/html/qhbuttongroup-h.html b/doc/html/qhbuttongroup-h.html
index fe10b65f..75771fc0 100644
--- a/doc/html/qhbuttongroup-h.html
+++ b/doc/html/qhbuttongroup-h.html
@@ -85,14 +85,14 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQHButtonGroup : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHButtonGroup( TQWidget* parent=0, const char* name=0 );
     TQHButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 );
     ~TQHButtonGroup();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHButtonGroup( const TQHButtonGroup & );
     TQHButtonGroup &operator=( const TQHButtonGroup & );
 #endif
diff --git a/doc/html/qheader-h.html b/doc/html/qheader-h.html
index 95c765a0..ee92c4a6 100644
--- a/doc/html/qheader-h.html
+++ b/doc/html/qheader-h.html
@@ -95,7 +95,7 @@ class Q_EXPORT TQHeader : public TQWidget
     friend class TQTableHeader;
     friend class TQListView;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
     Q_PROPERTY( int count READ count )
@@ -233,7 +233,7 @@ private:
     TQHeaderData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHeader( const TQHeader & );
     TQHeader &operator=( const TQHeader & );
 #endif
diff --git a/doc/html/qhgroupbox-h.html b/doc/html/qhgroupbox-h.html
index 0f88e13c..0a5c3a91 100644
--- a/doc/html/qhgroupbox-h.html
+++ b/doc/html/qhgroupbox-h.html
@@ -85,14 +85,14 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQHGroupBox : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHGroupBox( TQWidget* parent=0, const char* name=0 );
     TQHGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 );
     ~TQHGroupBox();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHGroupBox( const TQHGroupBox & );
     TQHGroupBox &operator=( const TQHGroupBox & );
 #endif
diff --git a/doc/html/qhostaddress-h.html b/doc/html/qhostaddress-h.html
index 3bb9fd0c..f5fa62dc 100644
--- a/doc/html/qhostaddress-h.html
+++ b/doc/html/qhostaddress-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
diff --git a/doc/html/qhttp-h.html b/doc/html/qhttp-h.html
index bd361bf8..e05fe103 100644
--- a/doc/html/qhttp-h.html
+++ b/doc/html/qhttp-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_HTTP
 #define TQM_TEMPLATE_EXTERN_HTTP
 #else
@@ -204,7 +204,7 @@ private:
 
 class TQM_EXPORT_HTTP TQHttp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQHttp();
diff --git a/doc/html/qiconset-h.html b/doc/html/qiconset-h.html
index 6c977be0..26d28f04 100644
--- a/doc/html/qiconset-h.html
+++ b/doc/html/qiconset-h.html
@@ -152,7 +152,7 @@ public:
     static void installDefaultFactory( TQIconFactory *factory );
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIconFactory( const TQIconFactory & );
     TQIconFactory &operator=( const TQIconFactory & );
 #endif
diff --git a/doc/html/qiconview-h.html b/doc/html/qiconview-h.html
index 87b7a008..7e319bb6 100644
--- a/doc/html/qiconview-h.html
+++ b/doc/html/qiconview-h.html
@@ -91,7 +91,7 @@ body { background: #ffffff; color: black; }
 
 #ifndef QT_NO_ICONVIEW
 
-#if !defined( QT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
+#if !defined( TQT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
 #define TQM_EXPORT_ICONVIEW
 #else
 #define TQM_EXPORT_ICONVIEW Q_EXPORT
@@ -130,7 +130,7 @@ private:
 
 class TQM_EXPORT_ICONVIEW TQIconDrag : public TQDragObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQIconDrag( TQWidget * dragSource, const char* name = 0 );
     virtual ~TQIconDrag();
@@ -147,7 +147,7 @@ private:
 
     friend class TQIconView;
     friend class TQIconViewPrivate;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQIconDrag( const TQIconDrag & );
     TQIconDrag &operator=( const TQIconDrag & );
 #endif
@@ -307,7 +307,7 @@ class TQM_EXPORT_ICONVIEW TQIconView : public TQScrollView
     friend class TQIconViewPrivate;
     friend class TQIconViewToolTip;
 
-    Q_OBJECT
+    TQ_OBJECT
     // #### sorting and sort direction do not work
     Q_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode )
     Q_PROPERTY( bool sorting READ sorting )
@@ -539,7 +539,7 @@ private:
     TQIconViewPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIconView( const TQIconView & );
     TQIconView& operator=( const TQIconView & );
 #endif
diff --git a/doc/html/qimage-h.html b/doc/html/qimage-h.html
index 47c35820..7f441e87 100644
--- a/doc/html/qimage-h.html
+++ b/doc/html/qimage-h.html
@@ -362,7 +362,7 @@ private:
     TQImageIOData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQImageIO( const TQImageIO & );
     TQImageIO &operator=( const TQImageIO & );
 #endif
diff --git a/doc/html/qimageformatplugin-h.html b/doc/html/qimageformatplugin-h.html
index e6fe8e7f..cdb02f1c 100644
--- a/doc/html/qimageformatplugin-h.html
+++ b/doc/html/qimageformatplugin-h.html
@@ -86,7 +86,7 @@ class TQImageFormatPluginPrivate;
 
 class Q_EXPORT TQImageFormatPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQImageFormatPlugin();
     ~TQImageFormatPlugin();
diff --git a/doc/html/qinputdialog-h.html b/doc/html/qinputdialog-h.html
index 8633f5e8..aa18888b 100644
--- a/doc/html/qinputdialog-h.html
+++ b/doc/html/qinputdialog-h.html
@@ -91,7 +91,7 @@ class TQInputDialogPrivate;
 
 class Q_EXPORT TQInputDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     enum Type { LineEdit, SpinBox, ComboBox, EditableComboBox };
@@ -131,7 +131,7 @@ private:
     friend class TQInputDialogPrivate; /* to avoid 'has no friends' warnings... */
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQInputDialog( const TQInputDialog & );
     TQInputDialog &operator=( const TQInputDialog & );
 #endif
diff --git a/doc/html/qiodevice-h.html b/doc/html/qiodevice-h.html
index 571bdca5..dfe36a22 100644
--- a/doc/html/qiodevice-h.html
+++ b/doc/html/qiodevice-h.html
@@ -190,7 +190,7 @@ private:
     int		 ioSt;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIODevice( const TQIODevice & );
     TQIODevice &operator=( const TQIODevice & );
 #endif
diff --git a/doc/html/qkbddriverplugin_qws-h.html b/doc/html/qkbddriverplugin_qws-h.html
index 68d5cd91..360432c8 100644
--- a/doc/html/qkbddriverplugin_qws-h.html
+++ b/doc/html/qkbddriverplugin_qws-h.html
@@ -87,7 +87,7 @@ class TQKbdDriverPluginPrivate;
 
 class Q_EXPORT TQKbdDriverPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQKbdDriverPlugin();
     ~TQKbdDriverPlugin();
diff --git a/doc/html/qkeyboard_qws-h.html b/doc/html/qkeyboard_qws-h.html
index e8101b8c..d8fe72e3 100644
--- a/doc/html/qkeyboard_qws-h.html
+++ b/doc/html/qkeyboard_qws-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 
 #ifndef QT_NO_QWS_KEYBOARD
 class TQWSKeyboardHandler : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWSKeyboardHandler();
     virtual ~TQWSKeyboardHandler();
diff --git a/doc/html/qlabel-h.html b/doc/html/qlabel-h.html
index 6d34c7fd..1b5429db 100644
--- a/doc/html/qlabel-h.html
+++ b/doc/html/qlabel-h.html
@@ -88,7 +88,7 @@ class TQLabelPrivate;
 
 class Q_EXPORT TQLabel : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
@@ -198,7 +198,7 @@ private:
     friend class TQTipLabel;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLabel( const TQLabel & );
     TQLabel &operator=( const TQLabel & );
 #endif
diff --git a/doc/html/qlayout-h.html b/doc/html/qlayout-h.html
index d65c21c9..96dbec6d 100644
--- a/doc/html/qlayout-h.html
+++ b/doc/html/qlayout-h.html
@@ -88,7 +88,7 @@ body { background: #ffffff; color: black; }
 #ifndef QT_NO_LAYOUT
 
 #if 0
-Q_OBJECT
+TQ_OBJECT
 #endif
 
 static const int TQLAYOUTSIZE_MAX = INT_MAX/256/16;
@@ -214,7 +214,7 @@ private:
 
 class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ResizeMode )
     Q_PROPERTY( int margin READ margin WRITE setMargin )
     Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
@@ -311,7 +311,7 @@ private:
 #endif
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLayout( const TQLayout & );
     TQLayout &operator=( const TQLayout & );
 #endif
@@ -326,7 +326,7 @@ inline void TQLayoutIterator::deleteCurrent()
 
 class Q_EXPORT TQGridLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -389,7 +389,7 @@ protected:
     void add( TQLayoutItem*, int row, int col );
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGridLayout( const TQGridLayout & );
     TQGridLayout &operator=( const TQGridLayout & );
 #endif
@@ -403,7 +403,7 @@ class TQDockWindow;
 
 class Q_EXPORT TQBoxLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop,
 		     Down = TopToBottom, Up = BottomToTop };
@@ -455,7 +455,7 @@ protected:
 
 private:
     friend class TQDockWindow;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQBoxLayout( const TQBoxLayout & );
     TQBoxLayout &operator=( const TQBoxLayout & );
 #endif
@@ -469,7 +469,7 @@ private:
 
 class Q_EXPORT TQHBoxLayout : public TQBoxLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -480,7 +480,7 @@ public:
     ~TQHBoxLayout();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHBoxLayout( const TQHBoxLayout & );
     TQHBoxLayout &operator=( const TQHBoxLayout & );
 #endif
@@ -488,7 +488,7 @@ private:	// Disabled copy constructor and operator=
 
 class Q_EXPORT TQVBoxLayout : public TQBoxLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -499,7 +499,7 @@ public:
     ~TQVBoxLayout();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVBoxLayout( const TQVBoxLayout & );
     TQVBoxLayout &operator=( const TQVBoxLayout & );
 #endif
diff --git a/doc/html/qlcdnumber-h.html b/doc/html/qlcdnumber-h.html
index 8d67f15d..1d4bb78f 100644
--- a/doc/html/qlcdnumber-h.html
+++ b/doc/html/qlcdnumber-h.html
@@ -89,7 +89,7 @@ class TQLCDNumberPrivate;
 
 class Q_EXPORT TQLCDNumber : public TQFrame		// LCD number widget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Mode SegmentStyle )
     Q_PROPERTY( bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint )
     Q_PROPERTY( int numDigits READ numDigits WRITE setNumDigits )
@@ -164,7 +164,7 @@ private:
     TQLCDNumberPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLCDNumber( const TQLCDNumber & );
     TQLCDNumber &operator=( const TQLCDNumber & );
 #endif
diff --git a/doc/html/qlibrary-h.html b/doc/html/qlibrary-h.html
index 0820273f..ef328a11 100644
--- a/doc/html/qlibrary-h.html
+++ b/doc/html/qlibrary-h.html
@@ -110,7 +110,7 @@ private:
     uint aunload : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLibrary( const TQLibrary & );
     TQLibrary &operator=( const TQLibrary & );
 #endif
diff --git a/doc/html/qlineedit-h.html b/doc/html/qlineedit-h.html
index a7440547..b1624b35 100644
--- a/doc/html/qlineedit-h.html
+++ b/doc/html/qlineedit-h.html
@@ -94,7 +94,7 @@ class TQTextCursor;
 
 class Q_EXPORT TQLineEdit : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( EchoMode )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( int maxLength READ maxLength WRITE setMaxLength )
@@ -255,7 +255,7 @@ private:
     TQLineEditPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLineEdit( const TQLineEdit & );
     TQLineEdit &operator=( const TQLineEdit & );
 #endif
diff --git a/doc/html/qlistbox-h.html b/doc/html/qlistbox-h.html
index 3f60e964..5d2aba30 100644
--- a/doc/html/qlistbox-h.html
+++ b/doc/html/qlistbox-h.html
@@ -97,7 +97,7 @@ class Q_EXPORT TQListBox : public TQScrollView
     friend class TQListBoxItem;
     friend class TQListBoxPrivate;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode LayoutMode )
     Q_PROPERTY( uint count READ count )
     Q_PROPERTY( int numItemsVisible READ numItemsVisible )
@@ -344,7 +344,7 @@ private:
     static TQListBox * changedListBox;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBox( const TQListBox & );
     TQListBox &operator=( const TQListBox & );
 #endif
@@ -402,7 +402,7 @@ private:
     friend class TQComboBoxPopupItem;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxItem( const TQListBoxItem & );
     TQListBoxItem &operator=( const TQListBoxItem & );
 #endif
@@ -427,7 +427,7 @@ protected:
     void  paint( TQPainter * );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxText( const TQListBoxText & );
     TQListBoxText &operator=( const TQListBoxText & );
 #endif
@@ -459,7 +459,7 @@ protected:
 private:
     TQPixmap pm;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxPixmap( const TQListBoxPixmap & );
     TQListBoxPixmap &operator=( const TQListBoxPixmap & );
 #endif
diff --git a/doc/html/qlistview-h.html b/doc/html/qlistview-h.html
index d86577f0..91eb2d14 100644
--- a/doc/html/qlistview-h.html
+++ b/doc/html/qlistview-h.html
@@ -276,7 +276,7 @@ class Q_EXPORT TQListView: public TQScrollView
     friend class TQCheckListItem;
     friend class TQListViewToolTip;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode ResizeMode RenameAction )
     Q_PROPERTY( int columns READ columns )
     Q_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false )
@@ -496,7 +496,7 @@ private:
     TQListViewPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListView( const TQListView & );
     TQListView &operator=( const TQListView & );
 #endif
diff --git a/doc/html/qlocalfs-h.html b/doc/html/qlocalfs-h.html
index 772d2e6b..bf16abc2 100644
--- a/doc/html/qlocalfs-h.html
+++ b/doc/html/qlocalfs-h.html
@@ -86,7 +86,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQLocalFs : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQLocalFs();
diff --git a/doc/html/qmacstyle_mac-h.html b/doc/html/qmacstyle_mac-h.html
index f8c20ba9..3bfbf102 100644
--- a/doc/html/qmacstyle_mac-h.html
+++ b/doc/html/qmacstyle_mac-h.html
@@ -95,7 +95,7 @@ class TQMacStylePrivate;
 
 class Q_EXPORT_STYLE_MAC TQMacStyle : public TQWindowsStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQMacStyle( );
     virtual ~TQMacStyle();
@@ -171,7 +171,7 @@ protected:
     bool event(TQEvent *);
 
 private:        // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMacStyle( const TQMacStyle & );
     TQMacStyle& operator=( const TQMacStyle & );
 #endif
diff --git a/doc/html/qmag-example.html b/doc/html/qmag-example.html
index c13c4c62..819d8a3f 100644
--- a/doc/html/qmag-example.html
+++ b/doc/html/qmag-example.html
@@ -67,7 +67,7 @@ magnified area as a .bmp file.
 
 class MagWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MagWidget( TQWidget *parent=0, const char *name=0 );
 
@@ -133,12 +133,12 @@ static const int timer[] = {
     int w=0, x=0, n;
 
     zoom = new TQComboBox( FALSE, this );
-    Q_CHECK_PTR(zoom);
+    TQ_CHECK_PTR(zoom);
     zoom->insertStrList( zoomfactors, 9 );
     connect( zoom, SIGNAL(activated(int)), SLOT(setZoom(int)) );
 
     refresh = new TQComboBox( FALSE, this );
-    Q_CHECK_PTR(refresh);
+    TQ_CHECK_PTR(refresh);
     refresh->insertStrList( refreshrates, 9 );
     connect( refresh, SIGNAL(activated(int)), SLOT(setRefresh(int)) );
 
@@ -157,7 +157,7 @@ static const int timer[] = {
     refresh->setGeometry( x, 2, w+30, 20 );
 
     saveButton = new TQPushButton( this );
-    Q_CHECK_PTR(saveButton);
+    TQ_CHECK_PTR(saveButton);
     connect( saveButton, SIGNAL(clicked()), this, SLOT(save()) );
     saveButton->setText( "Save" );
     saveButton->setGeometry( x+w+30+2, 2,
@@ -165,14 +165,14 @@ static const int timer[] = {
 
     multiSaveButton = new TQPushButton( this );
     multiSaveButton->setToggleButton(TRUE);
-    Q_CHECK_PTR(multiSaveButton);
+    TQ_CHECK_PTR(multiSaveButton);
     connect( multiSaveButton, SIGNAL(clicked()), this, SLOT(multiSave()) );
     multiSaveButton->setText( "MultiSave" );
     multiSaveButton->setGeometry( saveButton->geometry().right() + 2, 2,
                              10+multiSaveButton->fontMetrics().width("MultiSave"), 20 );
 
     quitButton = new TQPushButton( this );
-    Q_CHECK_PTR(quitButton);
+    TQ_CHECK_PTR(quitButton);
     connect( quitButton, SIGNAL(clicked()), qApp, SLOT(quit()) );
     quitButton->setText( "Quit" );
     quitButton->setGeometry( multiSaveButton->geometry().right() + 2, 2,
@@ -186,7 +186,7 @@ static const int timer[] = {
     setZoom(5);
 
     rgb = new TQLabel( this );
-    Q_CHECK_PTR( rgb );
+    TQ_CHECK_PTR( rgb );
     rgb->setText( "" );
     rgb->setAlignment( AlignVCenter );
     rgb->resize( width(), rgb->fontMetrics().height() + 4 );
diff --git a/doc/html/qmainwindow-h.html b/doc/html/qmainwindow-h.html
index c737e8bc..a7d72a8f 100644
--- a/doc/html/qmainwindow-h.html
+++ b/doc/html/qmainwindow-h.html
@@ -95,7 +95,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQMainWindow: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false )
     Q_PROPERTY( bool usesBigPixmaps READ usesBigPixmaps WRITE setUsesBigPixmaps )
     Q_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel )
@@ -238,7 +238,7 @@ private:
     friend class TQToolBar;
     friend class TQMainWindowLayout;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMainWindow( const TQMainWindow & );
     TQMainWindow& operator=( const TQMainWindow & );
 #endif
diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html
index b239495c..bfa3cb04 100644
--- a/doc/html/qmake-manual-8.html
+++ b/doc/html/qmake-manual-8.html
@@ -299,7 +299,7 @@ message($$join(urlPieces, $$LITERAL_HASH))
 
    OBJECTS
    
 
    This variable is generated from the SOURCES variable. The extension of each source file will have been replaced by .o (Unix) or .obj (Win32). The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.
    
 
    OBJMOC
    
-
    This variable is set by qmake if files can be found that contain the Q_OBJECT macro. OBJMOC contains the name of all intermediate moc object files. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.
    
+
    This variable is set by qmake if files can be found that contain the TQ_OBJECT macro. OBJMOC contains the name of all intermediate moc object files. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.
    
 
    PRECOMPILED_HEADER
    
 
    This variable indicates the header file for creating a precompiled header file, to increase the compilation speed of a project. Precompiled headers are currently only supported on some platforms (Windows - all MSVC project types, Mac OS X - Xcode, Makefile, UNIX - gcc 3.3 and up).
    
 
    On other platforms, this variable has different meaning, as noted below.
    
@@ -510,7 +510,7 @@ app {
 
    RES_FILE
    
 
    This variable contains the name of the resource file for the application. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.
    
 
    SRCMOC
    
-
    This variable is set by qmake if files can be found that contain the Q_OBJECT macro. SRCMOC contains the name of all the generated moc files. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.
    
+
    This variable is set by qmake if files can be found that contain the TQ_OBJECT macro. SRCMOC contains the name of all the generated moc files. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.
    
 
    TARGET_EXT
    
 
    This variable specifies the target's extension. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.
    
 
    TARGET_x
    
diff --git a/doc/html/qmenubar-h.html b/doc/html/qmenubar-h.html
index 8e969048..13917bd8 100644
--- a/doc/html/qmenubar-h.html
+++ b/doc/html/qmenubar-h.html
@@ -89,7 +89,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQMenuBar : public TQFrame, public TQMenuData
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Separator )
     Q_PROPERTY( Separator separator READ separator WRITE setSeparator DESIGNABLE false )
     Q_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp )
@@ -229,7 +229,7 @@ private:
 
 private:	// Disabled copy constructor and operator=
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuBar( const TQMenuBar & );
     TQMenuBar &operator=( const TQMenuBar & );
 #endif
diff --git a/doc/html/qmenudata-h.html b/doc/html/qmenudata-h.html
index 648c179f..4e4cacd8 100644
--- a/doc/html/qmenudata-h.html
+++ b/doc/html/qmenudata-h.html
@@ -148,7 +148,7 @@ private:
     TQMenuItemData* extra();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuItem( const TQMenuItem & );
     TQMenuItem &operator=( const TQMenuItem & );
 #endif
@@ -310,7 +310,7 @@ private:
     TQMenuDataData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuData( const TQMenuData & );
     TQMenuData &operator=( const TQMenuData & );
 #endif
diff --git a/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html
index e6171899..5c6bb833 100644
--- a/doc/html/qmessagebox-h.html
+++ b/doc/html/qmessagebox-h.html
@@ -89,7 +89,7 @@ struct TQMessageBoxData;
 
 class Q_EXPORT TQMessageBox : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Icon )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( Icon icon READ icon WRITE setIcon )
@@ -227,7 +227,7 @@ private:
     void       *reserved2;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMessageBox( const TQMessageBox & );
     TQMessageBox &operator=( const TQMessageBox & );
 #endif
@@ -249,7 +249,7 @@ TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()&
 (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\
 (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \
 TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' requires TQt "\
- "%2, found TQt %3.").arg(TQString::fromLatin1(qAppName())).arg(TQString::fromLatin1(\
+ "%2, found TQt %3.").arg(TQString::fromLatin1(tqAppName())).arg(TQString::fromLatin1(\
 str)).arg(TQString::fromLatin1(qVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\
 "Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); qFatal(s.ascii()); }}
 
diff --git a/doc/html/qmetaobject-h.html b/doc/html/qmetaobject-h.html
index 50632a83..410f4b12 100644
--- a/doc/html/qmetaobject-h.html
+++ b/doc/html/qmetaobject-h.html
@@ -287,7 +287,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMetaObject( const TQMetaObject & );
     TQMetaObject &operator=( const TQMetaObject & );
 #endif
diff --git a/doc/html/qmotif-h.html b/doc/html/qmotif-h.html
index fda9bb6b..848a5b98 100644
--- a/doc/html/qmotif-h.html
+++ b/doc/html/qmotif-h.html
@@ -72,7 +72,7 @@ class TQMotifPrivate;
 
 class TQMotif : public TQEventLoop
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQMotif( const char *applicationClass, XtAppContext context = NULL, XrmOptionDescRec *options = 0, int numOptions = 0);
diff --git a/doc/html/qmotifdialog-h.html b/doc/html/qmotifdialog-h.html
index 068df5dc..56b2dccd 100644
--- a/doc/html/qmotifdialog-h.html
+++ b/doc/html/qmotifdialog-h.html
@@ -74,7 +74,7 @@ class TQMotifDialogPrivate;
 
 class TQMotifDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     // obsolete
diff --git a/doc/html/qmotifplusstyle-h.html b/doc/html/qmotifplusstyle-h.html
index 56ffff28..ea191b9e 100644
--- a/doc/html/qmotifplusstyle-h.html
+++ b/doc/html/qmotifplusstyle-h.html
@@ -92,7 +92,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQMotifPlusStyle(bool hoveringHighlight = TRUE);
diff --git a/doc/html/qmotifstyle-h.html b/doc/html/qmotifstyle-h.html
index 66f6fec0..a1e9f797 100644
--- a/doc/html/qmotifstyle-h.html
+++ b/doc/html/qmotifstyle-h.html
@@ -94,7 +94,7 @@ class TQPalette;
 
 class Q_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQMotifStyle( bool useHighlightCols=FALSE );
     virtual ~TQMotifStyle();
@@ -161,7 +161,7 @@ private:
     bool highlightCols;
 
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMotifStyle( const TQMotifStyle & );
     TQMotifStyle& operator=( const TQMotifStyle & );
 #endif
diff --git a/doc/html/qmotifwidget-h.html b/doc/html/qmotifwidget-h.html
index b9cc6cbe..1288c93c 100644
--- a/doc/html/qmotifwidget-h.html
+++ b/doc/html/qmotifwidget-h.html
@@ -73,7 +73,7 @@ class TQKeyEvent;
 
 class TQMotifWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQMotifWidget( TQWidget *, WidgetClass, ArgList = NULL, Cardinal = 0,
diff --git a/doc/html/qmousedriverplugin_qws-h.html b/doc/html/qmousedriverplugin_qws-h.html
index 2e86338f..049b198c 100644
--- a/doc/html/qmousedriverplugin_qws-h.html
+++ b/doc/html/qmousedriverplugin_qws-h.html
@@ -87,7 +87,7 @@ class TQMouseDriverPluginPrivate;
 
 class Q_EXPORT TQMouseDriverPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQMouseDriverPlugin();
     ~TQMouseDriverPlugin();
diff --git a/doc/html/qmultilineedit-h.html b/doc/html/qmultilineedit-h.html
index 10ff44e9..24d4973c 100644
--- a/doc/html/qmultilineedit-h.html
+++ b/doc/html/qmultilineedit-h.html
@@ -89,7 +89,7 @@ class TQMultiLineEditData;
 
 class Q_EXPORT TQMultiLineEdit : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int numLines READ numLines )
     Q_PROPERTY( bool atBeginning READ atBeginning )
     Q_PROPERTY( bool atEnd READ atEnd )
@@ -166,7 +166,7 @@ private:
     TQMultiLineEditData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMultiLineEdit( const TQMultiLineEdit & );
     TQMultiLineEdit &operator=( const TQMultiLineEdit & );
 #endif
diff --git a/doc/html/qmutex-h.html b/doc/html/qmutex-h.html
index 1f293d43..724fe6e7 100644
--- a/doc/html/qmutex-h.html
+++ b/doc/html/qmutex-h.html
@@ -106,7 +106,7 @@ public:
 private:
     TQMutexPrivate * d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMutex( const TQMutex & );
     TQMutex &operator=( const TQMutex & );
 #endif
@@ -123,7 +123,7 @@ public:
 private:
     TQMutex *mtx;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMutexLocker( const TQMutexLocker & );
     TQMutexLocker &operator=( const TQMutexLocker & );
 #endif
diff --git a/doc/html/qnetworkprotocol-h.html b/doc/html/qnetworkprotocol-h.html
index 6cb85665..dae446c0 100644
--- a/doc/html/qnetworkprotocol-h.html
+++ b/doc/html/qnetworkprotocol-h.html
@@ -118,7 +118,7 @@ typedef TQDict< TQNetworkProtocolFactoryBase > TQNetworkProtocolDict;
 
 class Q_EXPORT TQNetworkProtocol : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum State {
@@ -224,7 +224,7 @@ private slots:
     void removeMe();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQNetworkProtocol( const TQNetworkProtocol & );
     TQNetworkProtocol &operator=( const TQNetworkProtocol & );
 #endif
@@ -234,7 +234,7 @@ class TQNetworkOperationPrivate;
 
 class Q_EXPORT TQNetworkOperation : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQUrlOperator;
 
 public:
@@ -269,7 +269,7 @@ private:
     TQNetworkOperationPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQNetworkOperation( const TQNetworkOperation & );
     TQNetworkOperation &operator=( const TQNetworkOperation & );
 #endif
diff --git a/doc/html/qnp-h.html b/doc/html/qnp-h.html
index f9383667..cb694520 100644
--- a/doc/html/qnp-h.html
+++ b/doc/html/qnp-h.html
@@ -117,7 +117,7 @@ private:
 };
 
 class TQNPWidget : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQNPWidget();
     ~TQNPWidget();
@@ -134,7 +134,7 @@ private:
 };
 
 class TQNPInstance : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ~TQNPInstance();
 
diff --git a/doc/html/qobject-h.html b/doc/html/qobject-h.html
index d358e7ac..19ae51d9 100644
--- a/doc/html/qobject-h.html
+++ b/doc/html/qobject-h.html
@@ -101,7 +101,7 @@ struct TQUObject;
 
 class Q_EXPORT TQObject: public TQt
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQCString name READ name WRITE setName )
 
 public:
@@ -246,7 +246,7 @@ private:
     friend class TQSignal;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQObject( const TQObject & );
     TQObject &operator=( const TQObject & );
 #endif
diff --git a/doc/html/qobjectcleanuphandler-h.html b/doc/html/qobjectcleanuphandler-h.html
index a9436835..1deec7de 100644
--- a/doc/html/qobjectcleanuphandler-h.html
+++ b/doc/html/qobjectcleanuphandler-h.html
@@ -83,7 +83,7 @@ class TQObjectList;
 
 class Q_EXPORT TQObjectCleanupHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQObjectCleanupHandler();
diff --git a/doc/html/qobjectlist-h.html b/doc/html/qobjectlist-h.html
index 248ba94b..a3309c37 100644
--- a/doc/html/qobjectlist-h.html
+++ b/doc/html/qobjectlist-h.html
@@ -109,7 +109,7 @@ public:
 		 TQPtrListIterator<TQObject>::operator=( i ); }
 };
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
 #warning "remove the TQObjectListIt class"
 #warning "remove the typedef too, maybe"
diff --git a/doc/html/qpaintdevice-h.html b/doc/html/qpaintdevice-h.html
index 5acf3a69..34c17d62 100644
--- a/doc/html/qpaintdevice-h.html
+++ b/doc/html/qpaintdevice-h.html
@@ -320,7 +320,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPaintDevice( const TQPaintDevice & );
     TQPaintDevice &operator=( const TQPaintDevice & );
 #endif
diff --git a/doc/html/qpainter-h.html b/doc/html/qpainter-h.html
index cb642b7a..58e4dfd0 100644
--- a/doc/html/qpainter-h.html
+++ b/doc/html/qpainter-h.html
@@ -463,7 +463,7 @@ protected:
     friend class TQPrinter;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPainter( const TQPainter & );
     TQPainter &operator=( const TQPainter & );
 #endif
diff --git a/doc/html/qplatinumstyle-h.html b/doc/html/qplatinumstyle-h.html
index 5a30c560..28ea3652 100644
--- a/doc/html/qplatinumstyle-h.html
+++ b/doc/html/qplatinumstyle-h.html
@@ -93,7 +93,7 @@ class TQPalette;
 
 class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQPlatinumStyle();
     virtual ~TQPlatinumStyle();
@@ -142,7 +142,7 @@ protected:
     void drawRiffles( TQPainter* p,  int x, int y, int w, int h,
 		      const TQColorGroup &g, bool horizontal ) const;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPlatinumStyle( const TQPlatinumStyle & );
     TQPlatinumStyle& operator=( const TQPlatinumStyle & );
 #endif
diff --git a/doc/html/qpopupmenu-h.html b/doc/html/qpopupmenu-h.html
index 22715bdf..6d09d617 100644
--- a/doc/html/qpopupmenu-h.html
+++ b/doc/html/qpopupmenu-h.html
@@ -87,7 +87,7 @@ class TQPopupMenuPrivate;
 
 class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
 public:
     TQPopupMenu( TQWidget* parent=0, const char* name=0 );
@@ -224,7 +224,7 @@ private:
     void connectModal(TQPopupMenu* receiver, bool doConnect);
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPopupMenu( const TQPopupMenu & );
     TQPopupMenu &operator=( const TQPopupMenu & );
 #endif
diff --git a/doc/html/qprinter-h.html b/doc/html/qprinter-h.html
index 574f410c..ed1dad1a 100644
--- a/doc/html/qprinter-h.html
+++ b/doc/html/qprinter-h.html
@@ -259,7 +259,7 @@ private:
     TQPrinterPrivate *d;
 
 private:        // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPrinter( const TQPrinter & );
     TQPrinter &operator=( const TQPrinter & );
 #endif
diff --git a/doc/html/qprocess-h.html b/doc/html/qprocess-h.html
index 7a150577..d95cfd31 100644
--- a/doc/html/qprocess-h.html
+++ b/doc/html/qprocess-h.html
@@ -91,7 +91,7 @@ class TQMembuf;
 
 class Q_EXPORT TQProcess : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQProcess( TQObject *parent=0, const char *name=0 );
     TQProcess( const TQString& arg0, TQObject *parent=0, const char *name=0 );
@@ -203,7 +203,7 @@ private:
     friend class TQProc;
 #endif
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQProcess( const TQProcess & );
     TQProcess &operator=( const TQProcess & );
 #endif
diff --git a/doc/html/qprogressbar-h.html b/doc/html/qprogressbar-h.html
index d7dcfd3d..a57114f8 100644
--- a/doc/html/qprogressbar-h.html
+++ b/doc/html/qprogressbar-h.html
@@ -89,7 +89,7 @@ class TQProgressBarPrivate;
 
 class Q_EXPORT TQProgressBar : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
     Q_PROPERTY( int progress READ progress WRITE setProgress )
     Q_PROPERTY( TQString progressString READ progressString )
@@ -143,7 +143,7 @@ private:
     void         initFrame();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQProgressBar( const TQProgressBar & );
     TQProgressBar &operator=( const TQProgressBar & );
 #endif
diff --git a/doc/html/qprogressdialog-h.html b/doc/html/qprogressdialog-h.html
index bfeac1d9..3b6946eb 100644
--- a/doc/html/qprogressdialog-h.html
+++ b/doc/html/qprogressdialog-h.html
@@ -91,7 +91,7 @@ class TQProgressDialogData;
 
 class Q_EXPORT TQProgressDialog : public TQDialog
 {
-    Q_OBJECT
+    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 )
@@ -166,7 +166,7 @@ private:
     TQTimer	  *forceTimer;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQProgressDialog( const TQProgressDialog & );
     TQProgressDialog &operator=( const TQProgressDialog & );
 #endif
diff --git a/doc/html/qpushbutton-h.html b/doc/html/qpushbutton-h.html
index 924311a3..e3f6c4e2 100644
--- a/doc/html/qpushbutton-h.html
+++ b/doc/html/qpushbutton-h.html
@@ -88,7 +88,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQPushButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( bool autoDefault READ autoDefault WRITE setAutoDefault )
     Q_PROPERTY( bool default READ isDefault WRITE setDefault )
@@ -173,7 +173,7 @@ private:
     friend class TQDialog;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPushButton( const TQPushButton & );
     TQPushButton &operator=( const TQPushButton & );
 #endif
diff --git a/doc/html/qradiobutton-h.html b/doc/html/qradiobutton-h.html
index 4bd7638b..08c6ae93 100644
--- a/doc/html/qradiobutton-h.html
+++ b/doc/html/qradiobutton-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQRadioButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
     Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
@@ -112,7 +112,7 @@ private:
     void    init();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRadioButton( const TQRadioButton & );
     TQRadioButton &operator=( const TQRadioButton & );
 #endif
diff --git a/doc/html/qrangecontrol-h.html b/doc/html/qrangecontrol-h.html
index 0af0ee7c..73b90d81 100644
--- a/doc/html/qrangecontrol-h.html
+++ b/doc/html/qrangecontrol-h.html
@@ -132,7 +132,7 @@ private:
     TQRangeControlPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRangeControl( const TQRangeControl & );
     TQRangeControl &operator=( const TQRangeControl & );
 #endif
@@ -165,7 +165,7 @@ inline int TQRangeControl::pageStep() const
 class TQSpinWidgetPrivate;
 class Q_EXPORT TQSpinWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSpinWidget( TQWidget* parent=0, const char* name=0 );
     ~TQSpinWidget();
@@ -219,7 +219,7 @@ private:
     void updateDisplay();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSpinWidget( const TQSpinWidget& );
     TQSpinWidget& operator=( const TQSpinWidget& );
 #endif
diff --git a/doc/html/qscrollbar-h.html b/doc/html/qscrollbar-h.html
index f0730616..6788e70d 100644
--- a/doc/html/qscrollbar-h.html
+++ b/doc/html/qscrollbar-h.html
@@ -88,7 +88,7 @@ class TQTimer;
 
 class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
     Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
@@ -195,7 +195,7 @@ private:
     void * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQScrollBar( const TQScrollBar & );
     TQScrollBar &operator=( const TQScrollBar & );
 #endif
diff --git a/doc/html/qscrollview-h.html b/doc/html/qscrollview-h.html
index 7bcf26e1..80994ca7 100644
--- a/doc/html/qscrollview-h.html
+++ b/doc/html/qscrollview-h.html
@@ -87,7 +87,7 @@ class TQScrollViewData;
 
 class Q_EXPORT TQScrollView : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ResizePolicy ScrollBarMode )
     Q_PROPERTY( ResizePolicy resizePolicy READ resizePolicy WRITE setResizePolicy )
     Q_PROPERTY( ScrollBarMode vScrollBarMode READ vScrollBarMode WRITE setVScrollBarMode )
@@ -289,7 +289,7 @@ private slots:
 #endif
 
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQScrollView( const TQScrollView & );
     TQScrollView &operator=( const TQScrollView & );
 #endif
diff --git a/doc/html/qsemaphore-h.html b/doc/html/qsemaphore-h.html
index 88d9014c..b92e7cd3 100644
--- a/doc/html/qsemaphore-h.html
+++ b/doc/html/qsemaphore-h.html
@@ -106,7 +106,7 @@ public:
 private:
     TQSemaphorePrivate *d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSemaphore(const TQSemaphore &);
     TQSemaphore &operator=(const TQSemaphore &);
 #endif
diff --git a/doc/html/qserversocket-h.html b/doc/html/qserversocket-h.html
index bf9dd9aa..0d676013 100644
--- a/doc/html/qserversocket-h.html
+++ b/doc/html/qserversocket-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
 #endif // QT_H
 #ifndef QT_NO_NETWORK
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -95,7 +95,7 @@ class TQServerSocketPrivate;
 
 class TQM_EXPORT_NETWORK TQServerSocket : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQServerSocket( Q_UINT16 port, int backlog = 1,
 		   TQObject *parent=0, const char *name=0 );
diff --git a/doc/html/qsessionmanager-h.html b/doc/html/qsessionmanager-h.html
index a5ff2a00..1f59a376 100644
--- a/doc/html/qsessionmanager-h.html
+++ b/doc/html/qsessionmanager-h.html
@@ -89,7 +89,7 @@ class TQSessionManagerData;
 
 class Q_EXPORT  TQSessionManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQSessionManager( TQApplication *app, TQString &id, TQString &key );
     ~TQSessionManager();
 public:
diff --git a/doc/html/qsettings-h.html b/doc/html/qsettings-h.html
index 55c61303..70419ed3 100644
--- a/doc/html/qsettings-h.html
+++ b/doc/html/qsettings-h.html
@@ -181,7 +181,7 @@ public:
 private:
     TQSettingsPrivate *d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSettings(const TQSettings &);
     TQSettings &operator=(const TQSettings &);
 #endif
diff --git a/doc/html/qsgistyle-h.html b/doc/html/qsgistyle-h.html
index a2a46d01..e5a314be 100644
--- a/doc/html/qsgistyle-h.html
+++ b/doc/html/qsgistyle-h.html
@@ -95,7 +95,7 @@ class TQSGIStylePrivate;
 
 class Q_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSGIStyle( bool useHighlightCols = FALSE );
     virtual ~TQSGIStyle();
@@ -157,7 +157,7 @@ private:
     TQSGIStylePrivate *d;
 
     uint isApplicationStyle :1;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSGIStyle( const TQSGIStyle & );
     TQSGIStyle& operator=( const TQSGIStyle & );
 #endif
diff --git a/doc/html/qsignal-h.html b/doc/html/qsignal-h.html
index 80622b02..7525e7b1 100644
--- a/doc/html/qsignal-h.html
+++ b/doc/html/qsignal-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQSignal : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQSignal( TQObject *parent=0, const char *name=0 );
@@ -120,7 +120,7 @@ private:
     TQVariant val;
 #endif
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSignal( const TQSignal & );
     TQSignal &operator=( const TQSignal & );
 #endif
diff --git a/doc/html/qsignalmapper-h.html b/doc/html/qsignalmapper-h.html
index 799aab1c..a2607504 100644
--- a/doc/html/qsignalmapper-h.html
+++ b/doc/html/qsignalmapper-h.html
@@ -86,7 +86,7 @@ struct TQSignalMapperRec;
 
 
 class Q_EXPORT TQSignalMapper : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSignalMapper( TQObject* parent, const char* name=0 );
     ~TQSignalMapper();
diff --git a/doc/html/qsimplerichtext-h.html b/doc/html/qsimplerichtext-h.html
index 3f388c3a..ec8eb7f4 100644
--- a/doc/html/qsimplerichtext-h.html
+++ b/doc/html/qsimplerichtext-h.html
@@ -129,7 +129,7 @@ private:
     TQSimpleRichTextData* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSimpleRichText( const TQSimpleRichText & );
     TQSimpleRichText &operator=( const TQSimpleRichText & );
 #endif
diff --git a/doc/html/qsizegrip-h.html b/doc/html/qsizegrip-h.html
index 8b52e351..53d49ecc 100644
--- a/doc/html/qsizegrip-h.html
+++ b/doc/html/qsizegrip-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQSizeGrip: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSizeGrip( TQWidget* parent, const char* name=0 );
     ~TQSizeGrip();
diff --git a/doc/html/qslider-h.html b/doc/html/qslider-h.html
index e2af2993..cba21ae8 100644
--- a/doc/html/qslider-h.html
+++ b/doc/html/qslider-h.html
@@ -90,7 +90,7 @@ class TQTimer;
 
 class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TickSetting )
     Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
@@ -204,7 +204,7 @@ private:
     Orientation orient;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSlider( const TQSlider & );
     TQSlider &operator=( const TQSlider & );
 #endif
diff --git a/doc/html/qsocket-h.html b/doc/html/qsocket-h.html
index a27e3d59..63d83726 100644
--- a/doc/html/qsocket-h.html
+++ b/doc/html/qsocket-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 #include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -96,7 +96,7 @@ class TQSocketDevice;
 
 class TQM_EXPORT_NETWORK TQSocket : public TQObject, public TQIODevice
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Error {
 	ErrConnectionRefused,
@@ -182,7 +182,7 @@ private:
     void         setSocketIntern( int socket );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocket( const TQSocket & );
     TQSocket &operator=( const TQSocket & );
 #endif
diff --git a/doc/html/qsocketdevice-h.html b/doc/html/qsocketdevice-h.html
index 15a85dff..9af059ab 100644
--- a/doc/html/qsocketdevice-h.html
+++ b/doc/html/qsocketdevice-h.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
 #include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -196,7 +196,7 @@ private:
     Protocol	 getProtocol() const;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocketDevice( const TQSocketDevice & );
     TQSocketDevice &operator=( const TQSocketDevice & );
 #endif
diff --git a/doc/html/qsocketnotifier-h.html b/doc/html/qsocketnotifier-h.html
index 8a3e1ce2..3e501718 100644
--- a/doc/html/qsocketnotifier-h.html
+++ b/doc/html/qsocketnotifier-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQSocketNotifier : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Type { Read, Write, Exception };
 
@@ -109,7 +109,7 @@ private:
     bool	 snenabled;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocketNotifier( const TQSocketNotifier & );
     TQSocketNotifier &operator=( const TQSocketNotifier & );
 #endif
diff --git a/doc/html/qsound-h.html b/doc/html/qsound-h.html
index e4181f50..b9e7c0da 100644
--- a/doc/html/qsound-h.html
+++ b/doc/html/qsound-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 class TQSoundData;
 
 class Q_EXPORT TQSound : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static bool isAvailable();
     static void play(const TQString& filename);
@@ -138,7 +138,7 @@ public:
 };
 
 class TQAuServer : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQAuServer(TQObject* parent, const char* name);
diff --git a/doc/html/qspinbox-h.html b/doc/html/qspinbox-h.html
index b329d71a..27dff493 100644
--- a/doc/html/qspinbox-h.html
+++ b/doc/html/qspinbox-h.html
@@ -90,7 +90,7 @@ class TQSpinBoxPrivate;
 
 class Q_EXPORT TQSpinBox: public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ButtonSymbols )
     Q_PROPERTY( TQString text READ text )
     Q_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
@@ -196,7 +196,7 @@ private:
     void arrangeWidgets();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSpinBox( const TQSpinBox& );
     TQSpinBox& operator=( const TQSpinBox& );
 #endif
diff --git a/doc/html/qsplashscreen-h.html b/doc/html/qsplashscreen-h.html
index d5eb7df6..94257eb2 100644
--- a/doc/html/qsplashscreen-h.html
+++ b/doc/html/qsplashscreen-h.html
@@ -85,7 +85,7 @@ class TQSplashScreenPrivate;
 
 class Q_EXPORT TQSplashScreen : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSplashScreen( const TQPixmap &pixmap = TQPixmap(), WFlags f = 0 );
     virtual ~TQSplashScreen();
diff --git a/doc/html/qsplitter-h.html b/doc/html/qsplitter-h.html
index 1ff93f0a..4e24851a 100644
--- a/doc/html/qsplitter-h.html
+++ b/doc/html/qsplitter-h.html
@@ -91,7 +91,7 @@ class TQTextStream;
 
 class Q_EXPORT TQSplitter : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize )
     Q_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth )
@@ -189,7 +189,7 @@ private:
 #endif
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSplitter( const TQSplitter & );
     TQSplitter& operator=( const TQSplitter & );
 #endif
diff --git a/doc/html/qsql-h.html b/doc/html/qsql-h.html
index 7e279923..e60370c4 100644
--- a/doc/html/qsql-h.html
+++ b/doc/html/qsql-h.html
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -124,7 +124,7 @@ public:
     };
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSql( const TQSql & );
     TQSql &operator=( const TQSql & );
 #endif
diff --git a/doc/html/qsqlcursor-h.html b/doc/html/qsqlcursor-h.html
index b9051369..dad0b586 100644
--- a/doc/html/qsqlcursor-h.html
+++ b/doc/html/qsqlcursor-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 #include "ntqsqlindex.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/doc/html/qsqldatabase-h.html b/doc/html/qsqldatabase-h.html
index 655ece56..7277cddd 100644
--- a/doc/html/qsqldatabase-h.html
+++ b/doc/html/qsqldatabase-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -113,7 +113,7 @@ public:
 
 class TQM_EXPORT_SQL TQSqlDatabase : public TQObject
 {
-    Q_OBJECT
+    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 )
@@ -179,7 +179,7 @@ protected:
 private:
     void 	init( const TQString& type, const TQString& name );
     TQSqlDatabasePrivate* d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlDatabase( const TQSqlDatabase & );
     TQSqlDatabase &operator=( const TQSqlDatabase & );
 #endif
diff --git a/doc/html/qsqldriver-h.html b/doc/html/qsqldriver-h.html
index 6b8f3458..629a0758 100644
--- a/doc/html/qsqldriver-h.html
+++ b/doc/html/qsqldriver-h.html
@@ -88,7 +88,7 @@ body { background: #ffffff; color: black; }
 #include "ntqmap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -103,7 +103,7 @@ class TQSqlDatabase;
 class TQM_EXPORT_SQL TQSqlDriver : public TQObject
 {
     friend class TQSqlDatabase;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries,
 			 NamedPlaceholders, PositionalPlaceholders };
@@ -150,7 +150,7 @@ private:
     // ### This class needs a d-pointer in 4.0.
     int		          dbState;
     TQSqlError	          error;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlDriver( const TQSqlDriver & );
     TQSqlDriver &operator=( const TQSqlDriver & );
 #endif
diff --git a/doc/html/qsqldriverplugin-h.html b/doc/html/qsqldriverplugin-h.html
index 5d0f3a3b..e9935ce2 100644
--- a/doc/html/qsqldriverplugin-h.html
+++ b/doc/html/qsqldriverplugin-h.html
@@ -90,7 +90,7 @@ class TQSqlDriverPluginPrivate;
 
 class Q_EXPORT TQSqlDriverPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlDriverPlugin();
     ~TQSqlDriverPlugin();
diff --git a/doc/html/qsqleditorfactory-h.html b/doc/html/qsqleditorfactory-h.html
index 100e4262..7ce6e30d 100644
--- a/doc/html/qsqleditorfactory-h.html
+++ b/doc/html/qsqleditorfactory-h.html
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
 #include "ntqeditorfactory.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -102,7 +102,7 @@ public:
     static void installDefaultFactory( TQSqlEditorFactory * factory );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlEditorFactory( const TQSqlEditorFactory & );
     TQSqlEditorFactory &operator=( const TQSqlEditorFactory & );
 #endif
diff --git a/doc/html/qsqlerror-h.html b/doc/html/qsqlerror-h.html
index 2fa14d43..537511ff 100644
--- a/doc/html/qsqlerror-h.html
+++ b/doc/html/qsqlerror-h.html
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/doc/html/qsqlfield-h.html b/doc/html/qsqlfield-h.html
index 315b4949..b3707d4a 100644
--- a/doc/html/qsqlfield-h.html
+++ b/doc/html/qsqlfield-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqvariant.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/doc/html/qsqlform-h.html b/doc/html/qsqlform-h.html
index bcc08398..597b21a5 100644
--- a/doc/html/qsqlform-h.html
+++ b/doc/html/qsqlform-h.html
@@ -81,7 +81,7 @@ body { background: #ffffff; color: black; }
 #include "ntqmap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -98,7 +98,7 @@ class TQSqlFormPrivate;
 
 class TQM_EXPORT_SQL TQSqlForm : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlForm( TQObject * parent = 0, const char * name = 0 );
     ~TQSqlForm();
@@ -133,7 +133,7 @@ private:
     virtual void sync();
     TQSqlFormPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlForm( const TQSqlForm & );
     TQSqlForm &operator=( const TQSqlForm & );
 #endif
diff --git a/doc/html/qsqlindex-h.html b/doc/html/qsqlindex-h.html
index 6bc90c43..0d399dc5 100644
--- a/doc/html/qsqlindex-h.html
+++ b/doc/html/qsqlindex-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
 #include "ntqsqlrecord.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #define TQM_TEMPLATE_EXTERN_SQL
 #else
diff --git a/doc/html/qsqlpropertymap-h.html b/doc/html/qsqlpropertymap-h.html
index 838f695c..ea8a0561 100644
--- a/doc/html/qsqlpropertymap-h.html
+++ b/doc/html/qsqlpropertymap-h.html
@@ -101,7 +101,7 @@ public:
     static void installDefaultMap( TQSqlPropertyMap * map );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlPropertyMap( const TQSqlPropertyMap & );
     TQSqlPropertyMap &operator=( const TQSqlPropertyMap & );
 #endif
diff --git a/doc/html/qsqlquery-h.html b/doc/html/qsqlquery-h.html
index f732c211..f60d27ac 100644
--- a/doc/html/qsqlquery-h.html
+++ b/doc/html/qsqlquery-h.html
@@ -94,7 +94,7 @@ class TQSqlDatabase;
 
 class Q_EXPORT TQSqlResultShared : public TQObject, public TQShared
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlResultShared( TQSqlResult* result );
     virtual ~TQSqlResultShared();
diff --git a/doc/html/qsqlresult-h.html b/doc/html/qsqlresult-h.html
index 5de04578..7846bc64 100644
--- a/doc/html/qsqlresult-h.html
+++ b/doc/html/qsqlresult-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
 #include "ntqsql.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -140,7 +140,7 @@ private:
     bool forwardOnly;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlResult( const TQSqlResult & );
     TQSqlResult &operator=( const TQSqlResult & );
 #endif
diff --git a/doc/html/qsqlselectcursor-h.html b/doc/html/qsqlselectcursor-h.html
index da3a1d4d..7641c442 100644
--- a/doc/html/qsqlselectcursor-h.html
+++ b/doc/html/qsqlselectcursor-h.html
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
 #include "ntqsqlcursor.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/doc/html/qstatusbar-h.html b/doc/html/qstatusbar-h.html
index d1a5eb53..3fa6e332 100644
--- a/doc/html/qstatusbar-h.html
+++ b/doc/html/qstatusbar-h.html
@@ -89,7 +89,7 @@ class TQStatusBarPrivate;
 
 class Q_EXPORT TQStatusBar: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
 
 public:
@@ -121,7 +121,7 @@ protected:
 private:
     TQStatusBarPrivate * d;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStatusBar( const TQStatusBar & );
     TQStatusBar& operator=( const TQStatusBar & );
 #endif
diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html
index b4027ea3..ae37a842 100644
--- a/doc/html/qstring-h.html
+++ b/doc/html/qstring-h.html
@@ -280,7 +280,7 @@ private:
 #if defined(QT_QSTRING_UCS_4)
     ushort grp;
 #endif
-} Q_PACKED;
+} TQ_PACKED;
 
 inline TQChar::TQChar() : ucs( 0 )
 #ifdef QT_QSTRING_UCS_4
@@ -426,7 +426,7 @@ struct Q_EXPORT TQStringData : public TQShared {
     uint islatin1 : 1;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStringData( const TQStringData& );
     TQStringData& operator=( const TQStringData& );
 #endif
diff --git a/doc/html/qstyle-h.html b/doc/html/qstyle-h.html
index 19a73707..4fd8e1ab 100644
--- a/doc/html/qstyle-h.html
+++ b/doc/html/qstyle-h.html
@@ -159,7 +159,7 @@ class TQStyleHintReturn; // not defined yet
 
 class Q_EXPORT TQStyle: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQStyle();
@@ -782,7 +782,7 @@ public:
 private:
     TQStylePrivate * d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStyle( const TQStyle & );
     TQStyle& operator=( const TQStyle & );
 #endif
diff --git a/doc/html/qstyleplugin-h.html b/doc/html/qstyleplugin-h.html
index 9bc86be5..69334411 100644
--- a/doc/html/qstyleplugin-h.html
+++ b/doc/html/qstyleplugin-h.html
@@ -90,7 +90,7 @@ class TQStylePluginPrivate;
 
 class Q_EXPORT TQStylePlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQStylePlugin();
     ~TQStylePlugin();
diff --git a/doc/html/qstylesheet-h.html b/doc/html/qstylesheet-h.html
index bb9e8a4f..9149f6ba 100644
--- a/doc/html/qstylesheet-h.html
+++ b/doc/html/qstylesheet-h.html
@@ -243,7 +243,7 @@ class TQTextCustomItem;
 
 class Q_EXPORT TQStyleSheet : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQStyleSheet( TQObject *parent=0, const char *name=0 );
     virtual ~TQStyleSheet();
@@ -278,7 +278,7 @@ private:
     TQDict<TQStyleSheetItem> styles;
     TQStyleSheetItem* nullstyle;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStyleSheet( const TQStyleSheet & );
     TQStyleSheet &operator=( const TQStyleSheet & );
 #endif
diff --git a/doc/html/qt-template-lib.html b/doc/html/qt-template-lib.html
index f76eb049..54b025ad 100644
--- a/doc/html/qt-template-lib.html
+++ b/doc/html/qt-template-lib.html
@@ -156,19 +156,19 @@ be treated as such.
 your data's class.
 
     Naturally, the sorting templates won't work with const iterators.
 
     
-
     qSwap()
+
     tqSwap()
 
    
-
     qSwap() exchanges the values of two variables:
+
     tqSwap() exchanges the values of two variables:
 
         TQString second( "Einstein" );
     TQString name( "Albert" );
-    qSwap( second, name );
+    tqSwap( second, name );
 
    
  
 
     
-
     qCount()
+
     tqCount()
 
    
-
     The qCount() template function counts the number of occurrences of a
+
     The tqCount() template function counts the number of occurrences of a
 value within a container. For example:
 
         TQValueList<int> list;
@@ -177,13 +177,13 @@ value within a container. For example:
     list.push_back( 1 );               
     list.push_back( 2 );               
     int c = 0;
-    qCount( list.begin(), list.end(), 1, c ); // c == 3
+    tqCount( list.begin(), list.end(), 1, c ); // c == 3
 
    
  	
 
     
-
     qFind()
+
     tqFind()
 
    
-
     The qFind() template function finds the first occurrence of a value
+
     The tqFind() template function finds the first occurrence of a value
 within a container. For example:
 
         TQValueList<int> list;
@@ -191,23 +191,23 @@ within a container. For example:
     list.push_back( 1 );               
     list.push_back( 1 );               
     list.push_back( 2 );               
-    TQValueListIterator<int> it = qFind( list.begin(), list.end(), 2 );
+    TQValueListIterator<int> it = tqFind( list.begin(), list.end(), 2 );
 
    
  	
 
     
-
     qFill()
+
     tqFill()
 
    
-
     The qFill() template function fills a range with copies of a value.
+
     The tqFill() template function fills a range with copies of a value.
 For example:
 
         TQValueVector<int> vec(3);
-    qFill( vec.begin(), vec.end(), 99 ); // vec contains 99, 99, 99
+    tqFill( vec.begin(), vec.end(), 99 ); // vec contains 99, 99, 99
 
    
  
 
     
-
     qEqual()
+
     tqEqual()
 
    
-
     The qEqual() template function compares two ranges for equality of
+
     The tqEqual() template function compares two ranges for equality of
 their elements. Note that the number of elements in each range is not
 considered, only if the elements in the first range are equal to the
 corresponding elements in the second range (consequently, both ranges
@@ -225,14 +225,14 @@ must be valid). For example:
     v2[4] = 4;
     v2[5] = 5;
 
-    bool b = qEqual( v1.begin(), v2.end(), v2.begin() );
+    bool b = tqEqual( v1.begin(), v2.end(), v2.begin() );
     // b == TRUE
 
    
  
 
     
-
     qCopy()
+
     tqCopy()
 
    
-
     The qCopy() template function copies a range of elements to an
+
     The tqCopy() template function copies a range of elements to an
 OutputIterator, in this case a TQTextOStreamIterator:
 
         TQValueList<int> list;
@@ -240,14 +240,14 @@ OutputIterator, in this case a TQTextOStreamIterator:
     list.push_back( 200 );
     list.push_back( 300 );
     TQTextOStream str( stdout );
-    qCopy( list.begin(), list.end(), TQTextOStreamIterator(str) );
+    tqCopy( list.begin(), list.end(), TQTextOStreamIterator(str) );
 
    
  
 
     
 
     
-
     qCopyBackward()
+
     tqCopyBackward()
 
    
-
     The qCopyBackward() template function copies a container or a slice of
+
     The tqCopyBackward() template function copies a container or a slice of
 a container to an OutputIterator, but in reverse order, for example:
 
         TQValueVector<int> vec(3);
@@ -255,7 +255,7 @@ a container to an OutputIterator, but in reverse order, for example:
     vec.push_back( 200 );
     vec.push_back( 300 );
     TQValueVector<int> another;
-    qCopyBackward( vec.begin(), vec.end(), another.begin() );
+    tqCopyBackward( vec.begin(), vec.end(), another.begin() );
     // 'another' now contains 100, 200, 300
     // however the elements are copied one at a time 
     // in reverse order (300, 200, then 100)
@@ -271,10 +271,10 @@ illustrates this:
     TQStringList list1, list2;
     list1 << "Weis" << "Ettrich" << "Arnt" << "Sue";
     list2 << "Torben" << "Matthias";
-    qCopy( list2.begin(), list2.end(), list1.begin() );
+    tqCopy( list2.begin(), list2.end(), list1.begin() );
 
     TQValueVector<TQString> vec( list1.size(), "Dave" );
-    qCopy( list2.begin(), list2.end(), vec.begin() );
+    tqCopy( list2.begin(), list2.end(), vec.begin() );
 
    
  
 
     At the end of this code fragment, the list list1 contains "Torben",
@@ -284,11 +284,11 @@ overwritten. The vector vec contains "Torben", "Matthias", "Dave" and
 
     If you write new algorithms, consider writing them as template
 functions in order to make them usable with as many containers
 as possible. In the above example, you could just as easily print out
-a standard C++ array with qCopy():
+a standard C++ array with tqCopy():
 
     
         int arr[] = { 100, 200, 300 };
     TQTextOStream str( stdout );
-    qCopy( arr, arr + 3, TQTextOStreamIterator( str ) ); 
+    tqCopy( arr, arr + 3, TQTextOStreamIterator( str ) ); 
 
    
  
 
     
     Streaming
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index a879ee7d..1ed36b86 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -237,7 +237,7 @@
     x11ProcessEvent
     ~QApplication
     Q_ASSERT
-    Q_CHECK_PTR
+    TQ_CHECK_PTR
     qAddPostRoutine
     qDebug
     qFatal
diff --git a/doc/html/qtabbar-h.html b/doc/html/qtabbar-h.html
index 2d924c61..c7150d17 100644
--- a/doc/html/qtabbar-h.html
+++ b/doc/html/qtabbar-h.html
@@ -123,7 +123,7 @@ struct TQTabPrivate;
 
 class Q_EXPORT TQTabBar: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Shape )
     Q_PROPERTY( Shape shape READ shape WRITE setShape )
     Q_PROPERTY( int currentTab READ currentTab WRITE setCurrentTab )
@@ -210,7 +210,7 @@ private:
     friend class TQTab;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabBar( const TQTabBar & );
     TQTabBar& operator=( const TQTabBar & );
 #endif
diff --git a/doc/html/qtabdialog-h.html b/doc/html/qtabdialog-h.html
index 8648dd97..01a7efd5 100644
--- a/doc/html/qtabdialog-h.html
+++ b/doc/html/qtabdialog-h.html
@@ -90,7 +90,7 @@ class  TQTabDialogPrivate;
 
 class Q_EXPORT TQTabDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTabDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
 		WFlags f=0 );
@@ -171,7 +171,7 @@ private:
 
     TQTabDialogPrivate *d;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabDialog( const TQTabDialog & );
     TQTabDialog& operator=( const TQTabDialog & );
 #endif
diff --git a/doc/html/qtable-h.html b/doc/html/qtable-h.html
index d7ec9342..1228d87e 100644
--- a/doc/html/qtable-h.html
+++ b/doc/html/qtable-h.html
@@ -92,7 +92,7 @@ body { background: #ffffff; color: black; }
 
 #ifndef QT_NO_TABLE
 
-#if !defined( QT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE )
+#if !defined( TQT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE )
 #define TQM_EXPORT_TABLE
 #ifndef TQM_TEMPLATE_EXTERN_TABLE
 #   define TQM_TEMPLATE_EXTERN_TABLE
@@ -210,7 +210,7 @@ private:
     uint enabled : 1;
     int rw, cl;
     int rowspan, colspan;
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Add a setAlignment() function in 4.0 (but no d pointer)"
 #endif
 };
@@ -281,7 +281,7 @@ private:
 
 class TQM_EXPORT_TABLE TQTable : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode FocusStyle )
     Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
     Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
@@ -587,7 +587,7 @@ private:
     FocusStyle focusStl;
     TQSize unused_cachedSizeHint; // ### remove in 4.0
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTable( const TQTable & );
     TQTable &operator=( const TQTable & );
 #endif
diff --git a/doc/html/qtabwidget-h.html b/doc/html/qtabwidget-h.html
index dfe756c6..bbd8dd5b 100644
--- a/doc/html/qtabwidget-h.html
+++ b/doc/html/qtabwidget-h.html
@@ -92,7 +92,7 @@ class TQWidgetStack;
 
 class Q_EXPORT TQTabWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TabPosition )
     Q_ENUMS( TabShape )
     Q_PROPERTY( TabPosition tabPosition READ tabPosition WRITE setTabPosition )
@@ -187,7 +187,7 @@ private:
     friend class TQTabDialog;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabWidget( const TQTabWidget & );
     TQTabWidget& operator=( const TQTabWidget & );
 #endif
diff --git a/doc/html/qtextbrowser-h.html b/doc/html/qtextbrowser-h.html
index fca1cdf2..564933da 100644
--- a/doc/html/qtextbrowser-h.html
+++ b/doc/html/qtextbrowser-h.html
@@ -90,7 +90,7 @@ class TQTextBrowserData;
 
 class Q_EXPORT TQTextBrowser : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString source READ source WRITE setSource )
     Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
@@ -132,7 +132,7 @@ private:
     TQTextBrowserData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextBrowser( const TQTextBrowser & );
     TQTextBrowser& operator=( const TQTextBrowser & );
 #endif
diff --git a/doc/html/qtextcodecplugin-h.html b/doc/html/qtextcodecplugin-h.html
index 65687851..5a5c5189 100644
--- a/doc/html/qtextcodecplugin-h.html
+++ b/doc/html/qtextcodecplugin-h.html
@@ -88,7 +88,7 @@ class TQTextCodecPluginPrivate;
 
 class Q_EXPORT TQTextCodecPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTextCodecPlugin();
     ~TQTextCodecPlugin();
diff --git a/doc/html/qtextedit-h.html b/doc/html/qtextedit-h.html
index 85875217..893798cb 100644
--- a/doc/html/qtextedit-h.html
+++ b/doc/html/qtextedit-h.html
@@ -173,7 +173,7 @@ class Q_EXPORT TQTextEdit : public TQScrollView
     friend class TQTextBrowser;
     friend class TQSyntaxHighlighter;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( WordWrap WrapPolicy )
     Q_SETS( AutoFormatting )
     Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
@@ -491,7 +491,7 @@ protected:
 protected slots:
     virtual void doChangeInterval();
     void sliderReleased(); // ### make virtual in 4.0
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Some functions need to be changed to virtual for TQt 4.0"
 #endif
 
@@ -624,7 +624,7 @@ private:
     bool overWrite : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextEdit( const TQTextEdit & );
     TQTextEdit &operator=( const TQTextEdit & );
 #endif
diff --git a/doc/html/qtextstream-h.html b/doc/html/qtextstream-h.html
index 342478c6..bc0ff79c 100644
--- a/doc/html/qtextstream-h.html
+++ b/doc/html/qtextstream-h.html
@@ -226,7 +226,7 @@ private:
     TQTextStream &writeBlock( const TQChar* p, uint len );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextStream( const TQTextStream & );
     TQTextStream &operator=( const TQTextStream & );
 #endif
@@ -244,7 +244,7 @@ public:
 	TQTextStream(f,IO_ReadOnly) { }
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextIStream( const TQTextIStream & );
     TQTextIStream &operator=( const TQTextIStream & );
 #endif
@@ -260,7 +260,7 @@ public:
 	TQTextStream(f,IO_WriteOnly) { }
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextOStream( const TQTextOStream & );
     TQTextOStream &operator=( const TQTextOStream & );
 #endif
diff --git a/doc/html/qtextview-h.html b/doc/html/qtextview-h.html
index b046c1dd..5d074281 100644
--- a/doc/html/qtextview-h.html
+++ b/doc/html/qtextview-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQTextView : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool modified SCRIPTABLE false)
@@ -100,7 +100,7 @@ public:
     virtual ~TQTextView();
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextView( const TQTextView & );
     TQTextView &operator=( const TQTextView & );
 #endif
diff --git a/doc/html/qthread-h.html b/doc/html/qthread-h.html
index 9500d699..0dc79aab 100644
--- a/doc/html/qthread-h.html
+++ b/doc/html/qthread-h.html
@@ -155,10 +155,10 @@ private:
     TQThreadInstance * d;
     friend class TQThreadInstance;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQThread( const TQThread & );
     TQThread &operator=( const TQThread & );
-#endif // Q_DISABLE_COPY
+#endif // TQ_DISABLE_COPY
 };
 
 #endif // QT_THREAD_SUPPORT
diff --git a/doc/html/qthreadstorage-h.html b/doc/html/qthreadstorage-h.html
index bb72f345..f8054c68 100644
--- a/doc/html/qthreadstorage-h.html
+++ b/doc/html/qthreadstorage-h.html
@@ -101,11 +101,11 @@ class TQThreadStorage
 private:
     TQThreadStorageData d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     // disable copy constructor and operator=
     TQThreadStorage( const TQThreadStorage & );
     TQThreadStorage &operator=( const TQThreadStorage & );
-#endif // Q_DISABLE_COPY
+#endif // TQ_DISABLE_COPY
 
     static void deleteData( void *x ) { delete (T)x; }
 
diff --git a/doc/html/qtimer-h.html b/doc/html/qtimer-h.html
index aeb4271b..b639bee7 100644
--- a/doc/html/qtimer-h.html
+++ b/doc/html/qtimer-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQTimer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTimer( TQObject *parent=0, const char *name=0 );
    ~TQTimer();
@@ -111,7 +111,7 @@ private:
     uint nulltimer : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTimer( const TQTimer & );
     TQTimer &operator=( const TQTimer & );
 #endif
diff --git a/doc/html/qtoolbar-h.html b/doc/html/qtoolbar-h.html
index c1c4af7b..f4de4dac 100644
--- a/doc/html/qtoolbar-h.html
+++ b/doc/html/qtoolbar-h.html
@@ -90,7 +90,7 @@ class TQToolBarPrivate;
 
 class Q_EXPORT TQToolBar: public TQDockWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString label READ label WRITE setLabel )
 
 public:
@@ -142,7 +142,7 @@ private:
     friend class TQMainWindow;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolBar( const TQToolBar & );
     TQToolBar& operator=( const TQToolBar & );
 #endif
diff --git a/doc/html/qtoolbox-h.html b/doc/html/qtoolbox-h.html
index b2957699..666b6d5f 100644
--- a/doc/html/qtoolbox-h.html
+++ b/doc/html/qtoolbox-h.html
@@ -89,7 +89,7 @@ class TQWidgetList;
 
 class Q_EXPORT TQToolBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex )
     Q_PROPERTY( int count READ count )
 
diff --git a/doc/html/qtoolbutton-h.html b/doc/html/qtoolbutton-h.html
index 09bc3ea4..34034bb5 100644
--- a/doc/html/qtoolbutton-h.html
+++ b/doc/html/qtoolbutton-h.html
@@ -92,7 +92,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQToolButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TextPosition )
 
     Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
@@ -185,7 +185,7 @@ protected:
     // ### Make virtual in 4.0, maybe act like TQPushButton with
     // regards to setFlat() instead?  Andy
     bool uses3D() const;
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Some functions need to be changed to virtual for TQt 4.0"
 #endif
 
@@ -217,7 +217,7 @@ private:
     uint hasArrow : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolButton( const TQToolButton & );
     TQToolButton& operator=( const TQToolButton & );
 #endif
diff --git a/doc/html/qtooltip-h.html b/doc/html/qtooltip-h.html
index e561611c..6364d5fc 100644
--- a/doc/html/qtooltip-h.html
+++ b/doc/html/qtooltip-h.html
@@ -91,7 +91,7 @@ class TQListViewToolTip;
 
 class Q_EXPORT TQToolTipGroup: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool delay READ delay WRITE setDelay )
     Q_PROPERTY( bool enabled READ enabled WRITE setEnabled )
 
@@ -117,7 +117,7 @@ private:
     friend class TQTipManager;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolTipGroup( const TQToolTipGroup & );
     TQToolTipGroup& operator=( const TQToolTipGroup & );
 #endif
diff --git a/doc/html/qtranslator-h.html b/doc/html/qtranslator-h.html
index b63510ba..ef885f10 100644
--- a/doc/html/qtranslator-h.html
+++ b/doc/html/qtranslator-h.html
@@ -140,7 +140,7 @@ private:
 
 class Q_EXPORT TQTranslator: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTranslator( TQObject * parent = 0, const char * name = 0 );
     ~TQTranslator();
@@ -188,7 +188,7 @@ public:
     bool isEmpty() const;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTranslator( const TQTranslator & );
     TQTranslator &operator=( const TQTranslator & );
 #endif
diff --git a/doc/html/qurlinfo-h.html b/doc/html/qurlinfo-h.html
index c7d7032c..c4feddfd 100644
--- a/doc/html/qurlinfo-h.html
+++ b/doc/html/qurlinfo-h.html
@@ -100,7 +100,7 @@ public:
     TQUrlInfo();
     TQUrlInfo( const TQUrlOperator &path, const TQString &file );
     TQUrlInfo( const TQUrlInfo &ui );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::TQUrlInfo() should accept TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQUrlInfo( const TQString &name, int permissions, const TQString &owner,
@@ -130,7 +130,7 @@ public:
     virtual void setSymLink( bool b );
     virtual void setOwner( const TQString &s );
     virtual void setGroup( const TQString &s );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::setSize() should accept TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     virtual void setSize( TQIODevice::Offset size );
@@ -148,7 +148,7 @@ public:
     int permissions() const;
     TQString owner() const;
     TQString group() const;
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::size() should return TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQIODevice::Offset size() const;
diff --git a/doc/html/qurloperator-h.html b/doc/html/qurloperator-h.html
index 3a314be2..d99c2b60 100644
--- a/doc/html/qurloperator-h.html
+++ b/doc/html/qurloperator-h.html
@@ -94,7 +94,7 @@ class Q_EXPORT TQUrlOperator : public TQObject, public TQUrl
 {
     friend class TQNetworkProtocol;
 
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQUrlOperator();
diff --git a/doc/html/qvalidator-h.html b/doc/html/qvalidator-h.html
index 5317cb3a..ce6eb652 100644
--- a/doc/html/qvalidator-h.html
+++ b/doc/html/qvalidator-h.html
@@ -88,7 +88,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQValidator : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQValidator( TQObject * parent, const char *name = 0 );
     ~TQValidator();
@@ -99,7 +99,7 @@ public:
     virtual void fixup( TQString & ) const;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQValidator( const TQValidator & );
     TQValidator& operator=( const TQValidator & );
 #endif
@@ -108,7 +108,7 @@ private:
 
 class Q_EXPORT TQIntValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int bottom READ bottom WRITE setBottom )
     Q_PROPERTY( int top READ top WRITE setTop )
 
@@ -128,7 +128,7 @@ public:
     int top() const { return t; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIntValidator( const TQIntValidator & );
     TQIntValidator& operator=( const TQIntValidator & );
 #endif
@@ -140,7 +140,7 @@ private:
 
 class Q_EXPORT TQDoubleValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( double bottom READ bottom WRITE setBottom )
     Q_PROPERTY( double top READ top WRITE setTop )
     Q_PROPERTY( int decimals READ decimals WRITE setDecimals )
@@ -163,7 +163,7 @@ public:
     int decimals() const { return d; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDoubleValidator( const TQDoubleValidator & );
     TQDoubleValidator& operator=( const TQDoubleValidator & );
 #endif
@@ -175,7 +175,7 @@ private:
 
 class Q_EXPORT TQRegExpValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     // Q_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp )
 
 public:
@@ -190,7 +190,7 @@ public:
     const TQRegExp& regExp() const { return r; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRegExpValidator( const TQRegExpValidator& );
     TQRegExpValidator& operator=( const TQRegExpValidator& );
 #endif
diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html
index a247846a..16d084b8 100644
--- a/doc/html/qvaluelist-h.html
+++ b/doc/html/qvaluelist-h.html
@@ -474,7 +474,7 @@ public:
     TQValueList( const std::list<T>& l )
     {
 	sh = new TQValueListPrivate<T>;
-	qCopy( l.begin(), l.end(), std::back_inserter( *this ) );
+	tqCopy( l.begin(), l.end(), std::back_inserter( *this ) );
     }
 #endif
     ~TQValueList() { sh->derefAndDelete(); }
@@ -490,7 +490,7 @@ public:
     TQValueList<T>& operator= ( const std::list<T>& l )
     {
 	detach();
-	qCopy( l.begin(), l.end(), std::back_inserter( *this ) );
+	tqCopy( l.begin(), l.end(), std::back_inserter( *this ) );
 	return *this;
     }
     bool operator== ( const std::list<T>& l ) const
diff --git a/doc/html/qvaluevector-h.html b/doc/html/qvaluevector-h.html
index 70d71c38..a51eb524 100644
--- a/doc/html/qvaluevector-h.html
+++ b/doc/html/qvaluevector-h.html
@@ -164,9 +164,9 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQ
 	finish = start + i;
 	end = start + i;
 #if defined(__xlC__) && __xlC__ < 0x400 // xlC 3.6 confused by const
-	qCopy( (pointer)x.start, (pointer)x.finish, start );
+	tqCopy( (pointer)x.start, (pointer)x.finish, start );
 #else
-	qCopy( x.start, x.finish, start );
+	tqCopy( x.start, x.finish, start );
 #endif
     } else {
 	start = 0;
@@ -197,9 +197,9 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, cons
     const size_t offset = pos - start;
     pointer newStart = new T[n];
     pointer newFinish = newStart + offset;
-    qCopy( start, pos, newStart );
+    tqCopy( start, pos, newStart );
     *newFinish = x;
-    qCopy( pos, finish, ++newFinish );
+    tqCopy( pos, finish, ++newFinish );
     delete[] start;
     start = newStart;
     finish = newStart + lastSize + 1;
@@ -214,31 +214,31 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size
 	const size_t elems_after = finish - pos;
 	pointer old_finish = finish;
 	if ( elems_after > n ) {
-	    qCopy( finish - n, finish, finish );
+	    tqCopy( finish - n, finish, finish );
 	    finish += n;
-	    qCopyBackward( pos, old_finish - n, old_finish );
-	    qFill( pos, pos + n, x );
+	    tqCopyBackward( pos, old_finish - n, old_finish );
+	    tqFill( pos, pos + n, x );
 	} else {
 	    pointer filler = finish;
 	    size_t i = n - elems_after;
 	    for ( ; i > 0; --i, ++filler )
 		*filler = x;
 	    finish += n - elems_after;
-	    qCopy( pos, old_finish, finish );
+	    tqCopy( pos, old_finish, finish );
 	    finish += elems_after;
-	    qFill( pos, old_finish, x );
+	    tqFill( pos, old_finish, x );
 	}
     } else {
 	// not enough room
 	const size_t lastSize = size();
 	const size_t len = lastSize + TQMAX( lastSize, n );
 	pointer newStart = new T[len];
-	pointer newFinish = qCopy( start, pos, newStart );
+	pointer newFinish = tqCopy( start, pos, newStart );
 	// fill up inserted space
 	size_t i = n;
 	for ( ; i > 0; --i, ++newFinish )
 	    *newFinish = x;
-	newFinish = qCopy( pos, finish, newFinish );
+	newFinish = tqCopy( pos, finish, newFinish );
 	delete[] start;
 	start = newStart;
 	finish = newFinish;
@@ -260,7 +260,7 @@ template <class T>
 Q_INLINE_TEMPLATES Q_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
 {
     pointer newStart = new T[n];
-    qCopy( s, f, newStart );
+    tqCopy( s, f, newStart );
     delete[] start;
     return newStart;
 }
@@ -302,13 +302,13 @@ public:
     TQValueVector( std::vector<T>& v ) // ### remove in 4.0
     {
 	sh = new TQValueVectorPrivate<T>( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
     }
 
     TQValueVector( const std::vector<T>& v )
     {
 	sh = new TQValueVectorPrivate<T>( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
     }
 #endif
 
@@ -330,7 +330,7 @@ public:
     {
 	clear();
 	resize( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
 	return *this;
     }
 #endif
@@ -475,7 +475,7 @@ public:
     {
 	detach();
 	if ( pos + 1 != end() )
-	    qCopy( pos + 1, sh->finish, pos );
+	    tqCopy( pos + 1, sh->finish, pos );
 	--sh->finish;
 	return pos;
     }
@@ -483,7 +483,7 @@ public:
     iterator erase( iterator first, iterator last )
     {
 	detach();
-	qCopy( last, sh->finish, first );
+	tqCopy( last, sh->finish, first );
 	sh->finish = sh->finish - ( last - first );
 	return first;
     }
@@ -491,12 +491,12 @@ public:
     // ### remove in TQt 4.0
     bool operator==( const TQValueVector<T>& x )
     {
-	return size()==x.size() ? qEqual( constBegin(), constEnd(), x.begin()) : FALSE;
+	return size()==x.size() ? tqEqual( constBegin(), constEnd(), x.begin()) : FALSE;
     }
 
     bool operator==( const TQValueVector<T>& x ) const
     {
-	return size()==x.size() ? qEqual( begin(), end(), x.begin() ) : FALSE;
+	return size()==x.size() ? tqEqual( begin(), end(), x.begin() ) : FALSE;
     }
 
     typedef T ValueType;
@@ -528,7 +528,7 @@ template <class T>
 Q_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val )
 {
     sh = new TQValueVectorPrivate<T>( n );
-    qFill( begin(), end(), val );
+    tqFill( begin(), end(), val );
 }
 
 template <class T>
@@ -556,7 +556,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<
 	} else {
 	    *sh->finish = *(sh->finish - 1);
 	    ++sh->finish;
-	    qCopyBackward( pos, sh->finish - 2, sh->finish - 1 );
+	    tqCopyBackward( pos, sh->finish - 2, sh->finish - 1 );
 	    *pos = x;
 	}
     }
diff --git a/doc/html/qvbox-h.html b/doc/html/qvbox-h.html
index 63f5552d..6a1652f2 100644
--- a/doc/html/qvbox-h.html
+++ b/doc/html/qvbox-h.html
@@ -85,12 +85,12 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQVBox : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVBox( TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVBox( const TQVBox & );
     TQVBox& operator=( const TQVBox & );
 #endif
diff --git a/doc/html/qvbuttongroup-h.html b/doc/html/qvbuttongroup-h.html
index 1ba6d29b..ab0693b9 100644
--- a/doc/html/qvbuttongroup-h.html
+++ b/doc/html/qvbuttongroup-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQVButtonGroup : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVButtonGroup( TQWidget* parent=0, const char* name=0 );
     TQVButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 );
@@ -93,7 +93,7 @@ public:
     ~TQVButtonGroup();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVButtonGroup( const TQVButtonGroup & );
     TQVButtonGroup &operator=( const TQVButtonGroup & );
 #endif
diff --git a/doc/html/qvgroupbox-h.html b/doc/html/qvgroupbox-h.html
index 5caf5527..cffc1cdd 100644
--- a/doc/html/qvgroupbox-h.html
+++ b/doc/html/qvgroupbox-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT TQVGroupBox : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVGroupBox( TQWidget* parent=0, const char* name=0 );
     TQVGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 );
@@ -93,7 +93,7 @@ public:
     ~TQVGroupBox();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVGroupBox( const TQVGroupBox & );
     TQVGroupBox &operator=( const TQVGroupBox & );
 #endif
diff --git a/doc/html/qwaitcondition-h.html b/doc/html/qwaitcondition-h.html
index e84a3624..e28021a8 100644
--- a/doc/html/qwaitcondition-h.html
+++ b/doc/html/qwaitcondition-h.html
@@ -104,7 +104,7 @@ public:
 private:
     TQWaitConditionPrivate * d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWaitCondition( const TQWaitCondition & );
     TQWaitCondition &operator=( const TQWaitCondition & );
 #endif
diff --git a/doc/html/qwerty-example.html b/doc/html/qwerty-example.html
index 1bc1688e..c1b4413d 100644
--- a/doc/html/qwerty-example.html
+++ b/doc/html/qwerty-example.html
@@ -55,7 +55,7 @@ body { background: #ffffff; color: black; }
 
 class Editor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Editor( TQWidget *parent=0, const char *name="qwerty" );
    ~Editor();
@@ -135,7 +135,7 @@ enum { Uni = 0, MBug = 1, Lat1 = 2, Local = 3, Guess = 4, Codec = 5 };
     m = new TQMenuBar( this, "menu" );
 
     TQPopupMenu * file = new TQPopupMenu();
-    Q_CHECK_PTR( file );
+    TQ_CHECK_PTR( file );
     m->insertItem( "&File", file );
 
     file->insertItem( "&New",   this, SLOT(newDoc()),   ALT+Key_N );
@@ -160,7 +160,7 @@ enum { Uni = 0, MBug = 1, Lat1 = 2, Local = 3, Guess = 4, Codec = 5 };
     rebuildCodecList();
 
     TQPopupMenu * edit = new TQPopupMenu();
-    Q_CHECK_PTR( edit );
+    TQ_CHECK_PTR( edit );
     m->insertItem( "&Edit", edit );
 
     edit->insertItem( "To &Uppercase",   this, SLOT(toUpper()),   ALT+Key_U );
diff --git a/doc/html/qwidget-h.html b/doc/html/qwidget-h.html
index aaab7af3..a4a092cf 100644
--- a/doc/html/qwidget-h.html
+++ b/doc/html/qwidget-h.html
@@ -98,7 +98,7 @@ class TQStyle;
 
 class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
     Q_PROPERTY( bool isTopLevel READ isTopLevel )
     Q_PROPERTY( bool isDialog READ isDialog )
@@ -731,7 +731,7 @@ private:
     friend class TQLayout;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidget( const TQWidget & );
     TQWidget &operator=( const TQWidget & );
 #endif
diff --git a/doc/html/qwidgetplugin-h.html b/doc/html/qwidgetplugin-h.html
index 3dd51ac4..09d9ab34 100644
--- a/doc/html/qwidgetplugin-h.html
+++ b/doc/html/qwidgetplugin-h.html
@@ -99,7 +99,7 @@ class TQWidget;
 
 class Q_EXPORT TQWidgetPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidgetPlugin();
     ~TQWidgetPlugin();
diff --git a/doc/html/qwidgetstack-h.html b/doc/html/qwidgetstack-h.html
index 4aa124ca..d0c2c2ce 100644
--- a/doc/html/qwidgetstack-h.html
+++ b/doc/html/qwidgetstack-h.html
@@ -91,7 +91,7 @@ class TQWidgetStackPrivate;
 
 class Q_EXPORT TQWidgetStack: public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidgetStack( TQWidget* parent=0, const char* name=0 );
     TQWidgetStack( TQWidget* parent, const char* name, WFlags f);
@@ -137,7 +137,7 @@ private:
     TQWidget * invisible;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidgetStack( const TQWidgetStack & );
     TQWidgetStack& operator=( const TQWidgetStack & );
 #endif
diff --git a/doc/html/qwindowdefs-h.html b/doc/html/qwindowdefs-h.html
index 658673a1..ff2fc747 100644
--- a/doc/html/qwindowdefs-h.html
+++ b/doc/html/qwindowdefs-h.html
@@ -216,7 +216,7 @@ const TQCOORD TQCOORD_MIN = -TQCOORD_MAX - 1;
 
 typedef unsigned int TQRgb;			// RGB triplet
 
-Q_EXPORT const char *qAppName();		// get application name
+Q_EXPORT const char *tqAppName();		// get application name
 
 // Misc functions
 
diff --git a/doc/html/qwindowsstyle-h.html b/doc/html/qwindowsstyle-h.html
index 66443aa2..e5e01863 100644
--- a/doc/html/qwindowsstyle-h.html
+++ b/doc/html/qwindowsstyle-h.html
@@ -92,7 +92,7 @@ body { background: #ffffff; color: black; }
 
 class Q_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWindowsStyle();
     ~TQWindowsStyle();
@@ -160,7 +160,7 @@ private:
     Private *d;
 
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWindowsStyle( const TQWindowsStyle & );
     TQWindowsStyle& operator=( const TQWindowsStyle & );
 #endif
diff --git a/doc/html/qwindowsystem_qws-h.html b/doc/html/qwindowsystem_qws-h.html
index 4827b706..3476c984 100644
--- a/doc/html/qwindowsystem_qws-h.html
+++ b/doc/html/qwindowsystem_qws-h.html
@@ -183,7 +183,7 @@ class TQWSSoundServer;
 class TQWSSoundServerData;
 
 class TQWSSoundServer : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWSSoundServer(TQObject* parent);
     ~TQWSSoundServer();
@@ -222,7 +222,7 @@ class TQWSServer : public TQObject
     friend class TQWSWindow;
     friend class TQWSDisplay;
     friend class TQWSInputMethod;
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQWSServer( int flags = 0, TQObject *parent=0, const char *name=0 );
@@ -568,7 +568,7 @@ typedef TQMap<int, TQWSCursor*> TQWSCursorMap;
 
 class TQWSClient : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWSClient( TQObject* parent, int socket, int id );
     ~TQWSClient();
diff --git a/doc/html/qwizard-h.html b/doc/html/qwizard-h.html
index 32126b63..f5aded81 100644
--- a/doc/html/qwizard-h.html
+++ b/doc/html/qwizard-h.html
@@ -89,7 +89,7 @@ class TQWizardPrivate;
 
 class Q_EXPORT TQWizard : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont )
 
 public:
@@ -167,7 +167,7 @@ private:
     TQWizardPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWizard( const TQWizard & );
     TQWizard& operator=( const TQWizard & );
 #endif
diff --git a/doc/html/qworkspace-h.html b/doc/html/qworkspace-h.html
index e66c4a25..7e08d064 100644
--- a/doc/html/qworkspace-h.html
+++ b/doc/html/qworkspace-h.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
 
 #ifndef QT_NO_WORKSPACE
 
-#if !defined( QT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE )
+#if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE )
 #define TQM_EXPORT_WORKSPACE
 #else
 #define TQM_EXPORT_WORKSPACE Q_EXPORT
@@ -98,7 +98,7 @@ class TQDockWindow;
 
 class TQM_EXPORT_WORKSPACE TQWorkspace : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled )
 
 #ifdef QT_WORKSPACE_WINDOWMODE
@@ -193,7 +193,7 @@ private:
     friend class TQWorkspaceChild;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWorkspace( const TQWorkspace & );
     TQWorkspace& operator=( const TQWorkspace & );
 #endif
diff --git a/doc/html/qxml-h.html b/doc/html/qxml-h.html
index b30a85f1..1abf42c8 100644
--- a/doc/html/qxml-h.html
+++ b/doc/html/qxml-h.html
@@ -85,7 +85,7 @@ body { background: #ffffff; color: black; }
 #include "ntqvaluevector.h"
 #endif // QT_H
 
-#if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
+#if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
 #define TQM_EXPORT_XML
 #else
 #define TQM_EXPORT_XML Q_EXPORT
diff --git a/doc/html/qxtwidget-h.html b/doc/html/qxtwidget-h.html
index e2f04bea..122a636c 100644
--- a/doc/html/qxtwidget-h.html
+++ b/doc/html/qxtwidget-h.html
@@ -70,7 +70,7 @@ body { background: #ffffff; color: black; }
 
 
 class TQXtWidget : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
     Widget xtw;
     Widget xtparent;
     bool   need_reroot;
diff --git a/doc/html/rangecontrols-example.html b/doc/html/rangecontrols-example.html
index 632196c8..22b802f9 100644
--- a/doc/html/rangecontrols-example.html
+++ b/doc/html/rangecontrols-example.html
@@ -56,7 +56,7 @@ class TQCheckBox;
 
 class RangeControls : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RangeControls( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/regexptester-example.html b/doc/html/regexptester-example.html
index 432d3f56..b12c4065 100644
--- a/doc/html/regexptester-example.html
+++ b/doc/html/regexptester-example.html
@@ -59,7 +59,7 @@ class TQTable;
 
 class RegexpTester : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RegexpTester(TQWidget* parent=0, const char* name=0, bool modal=false,
diff --git a/doc/html/richtext-example.html b/doc/html/richtext-example.html
index 2540895f..eea3cfc2 100644
--- a/doc/html/richtext-example.html
+++ b/doc/html/richtext-example.html
@@ -58,7 +58,7 @@ class TQPushButton;
 
 class MyRichText : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MyRichText( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/rot-example.html b/doc/html/rot-example.html
index ced6f0d5..64aacf9c 100644
--- a/doc/html/rot-example.html
+++ b/doc/html/rot-example.html
@@ -60,7 +60,7 @@ the rot13 algorithm.
 class TQMultiLineEdit;
 
 class Rot13: public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Rot13();
 
diff --git a/doc/html/scribble-example.html b/doc/html/scribble-example.html
index 1b0acd04..b354b6d9 100644
--- a/doc/html/scribble-example.html
+++ b/doc/html/scribble-example.html
@@ -66,7 +66,7 @@ class TQSpinBox;
 
 class Canvas : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Canvas( TQWidget *parent = 0, const char *name = 0 );
@@ -105,7 +105,7 @@ protected:
 
 class Scribble : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Scribble( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/scrollview-example.html b/doc/html/scrollview-example.html
index 5f5ddd7b..0c33a7ff 100644
--- a/doc/html/scrollview-example.html
+++ b/doc/html/scrollview-example.html
@@ -72,7 +72,7 @@ static const int max_mw         = 10;
 
 
 class BigShrinker : public TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BigShrinker(TQWidget* parent) :
         TQFrame(parent)
@@ -235,22 +235,22 @@ private:
 };
 
 class ScrollViewExample : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ScrollViewExample(int technique, TQWidget* parent=0, const char* name=0) :
         TQWidget(parent,name)
     {
         TQMenuBar* menubar = new TQMenuBar(this);
-        Q_CHECK_PTR( menubar );
+        TQ_CHECK_PTR( menubar );
 
         TQPopupMenu* file = new TQPopupMenu( menubar );
-        Q_CHECK_PTR( file );
+        TQ_CHECK_PTR( file );
         menubar->insertItem( "&File", file );
         file->insertItem( "Quit", qApp,  SLOT(quit()) );
 
         vp_options = new TQPopupMenu( menubar );
-        Q_CHECK_PTR( vp_options );
+        TQ_CHECK_PTR( vp_options );
         vp_options->setCheckable( TRUE );
         menubar->insertItem( "&ScrollView", vp_options );
         connect( vp_options, SIGNAL(activated(int)),
@@ -288,7 +288,7 @@ public:
         }
 
         f_options = new TQPopupMenu( menubar );
-        Q_CHECK_PTR( f_options );
+        TQ_CHECK_PTR( f_options );
         f_options->setCheckable( TRUE );
         menubar->insertItem( "F&rame", f_options );
         connect( f_options, SIGNAL(activated(int)),
@@ -305,7 +305,7 @@ public:
             f_options->insertItem( "Sunken", style_id|TQFrame::Sunken ));
         f_options->insertSeparator();
         lw_options = new TQPopupMenu( menubar );
-        Q_CHECK_PTR( lw_options );
+        TQ_CHECK_PTR( lw_options );
         lw_options->setCheckable( TRUE );
         for (int lw = 1; lw <= max_lw; lw++) {
             TQString str;
@@ -316,7 +316,7 @@ public:
         connect( lw_options, SIGNAL(activated(int)),
             this, SLOT(doFMenuItem(int)) );
         mlw_options = new TQPopupMenu( menubar );
-        Q_CHECK_PTR( mlw_options );
+        TQ_CHECK_PTR( mlw_options );
         mlw_options->setCheckable( TRUE );
         for (int mlw = 0; mlw <= max_mlw; mlw++) {
             TQString str;
@@ -327,7 +327,7 @@ public:
         connect( mlw_options, SIGNAL(activated(int)),
             this, SLOT(doFMenuItem(int)) );
         mw_options = new TQPopupMenu( menubar );
-        Q_CHECK_PTR( mw_options );
+        TQ_CHECK_PTR( mw_options );
         mw_options->setCheckable( TRUE );
         for (int mw = 0; mw <= max_mw; mw++) {
             TQString str;
diff --git a/doc/html/showimg-example.html b/doc/html/showimg-example.html
index 48d883ee..701b6930 100644
--- a/doc/html/showimg-example.html
+++ b/doc/html/showimg-example.html
@@ -60,7 +60,7 @@ class TQPopupMenu;
 
 class ImageViewer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ImageViewer( TQWidget *parent=0, const char *name=0, int wFlags=0 );
     ~ImageViewer();
diff --git a/doc/html/signalsandslots.html b/doc/html/signalsandslots.html
index 0421e7bc..4b4059eb 100644
--- a/doc/html/signalsandslots.html
+++ b/doc/html/signalsandslots.html
@@ -109,7 +109,7 @@ mechanism.
 
     
         class Foo : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Foo();
         int value() const { return val; }
@@ -127,7 +127,7 @@ state, but in addition it has support for component programming using
 signals and slots: this class can tell the outside world that its state
 has changed by emitting a signal, valueChanged(), and it has
 a slot which other objects can send signals to.
-
     All classes that contain signals or slots must mention Q_OBJECT in
+
     All classes that contain signals or slots must mention TQ_OBJECT in
 their declaration.
 
     Slots are implemented by the application programmer.
 Here is a possible implementation of Foo::setValue():
@@ -283,10 +283,10 @@ knowledge, via TQFrame and 
 declarations.
 
     
         {
-        Q_OBJECT
+        TQ_OBJECT
 
    
  
-
     Q_OBJECT is expanded by the preprocessor to declare several member
+
     TQ_OBJECT is expanded by the preprocessor to declare several member
 functions that are implemented by the moc; if you get compiler errors
 along the lines of "virtual function TQButton::className not defined"
 you have probably forgotten to run the moc or to
diff --git a/doc/html/simple-application-example.html b/doc/html/simple-application-example.html
index 1fe091b9..25ee03d5 100644
--- a/doc/html/simple-application-example.html
+++ b/doc/html/simple-application-example.html
@@ -59,7 +59,7 @@ class TQTextEdit;
 
 class ApplicationWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ApplicationWindow();
diff --git a/doc/html/simple-application.html b/doc/html/simple-application.html
index fd1d669d..95af018e 100644
--- a/doc/html/simple-application.html
+++ b/doc/html/simple-application.html
@@ -61,7 +61,7 @@ class TQTextEdit;
 
 class ApplicationWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ApplicationWindow();
diff --git a/doc/html/simple-font-demo-example.html b/doc/html/simple-font-demo-example.html
index 748a6534..f2624e3f 100644
--- a/doc/html/simple-font-demo-example.html
+++ b/doc/html/simple-font-demo-example.html
@@ -51,7 +51,7 @@ class TQPushButton;
 
 class Viewer : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     Viewer();
diff --git a/doc/html/simple_dd-example.html b/doc/html/simple_dd-example.html
index 95103a10..50add5a0 100644
--- a/doc/html/simple_dd-example.html
+++ b/doc/html/simple_dd-example.html
@@ -61,7 +61,7 @@ class TQDragDropEvent;
 
 class DDListBox : public TQListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DDListBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
     // Low-level drag and drop
@@ -89,7 +89,7 @@ public:
 
 class DDIconView : public TQIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DDIconView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) :
         TQIconView( parent, name, f ) {}
diff --git a/doc/html/sound-example.html b/doc/html/sound-example.html
index c2ba5b42..2cb98706 100644
--- a/doc/html/sound-example.html
+++ b/doc/html/sound-example.html
@@ -53,7 +53,7 @@ if your machine is set up to play audio.
 #include <ntqmainwindow.h>
 
 class SoundPlayer : public TQMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SoundPlayer();
 
diff --git a/doc/html/sql-overview-custom1-main-h.html b/doc/html/sql-overview-custom1-main-h.html
index 55561614..0798283b 100644
--- a/doc/html/sql-overview-custom1-main-h.html
+++ b/doc/html/sql-overview-custom1-main-h.html
@@ -56,7 +56,7 @@ body { background: #ffffff; color: black; }
 
 class CustomEdit : public TQLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
     public:
         CustomEdit( TQWidget *parent=0, const char *name=0 );
@@ -71,7 +71,7 @@ class CustomEdit : public TQLineEdit
 
 class FormDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         FormDialog();
         ~FormDialog();
diff --git a/doc/html/sql-overview-form2-main-h.html b/doc/html/sql-overview-form2-main-h.html
index 5c0e6cea..a1eead4a 100644
--- a/doc/html/sql-overview-form2-main-h.html
+++ b/doc/html/sql-overview-form2-main-h.html
@@ -55,7 +55,7 @@ body { background: #ffffff; color: black; }
 
 class FormDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         FormDialog();
         ~FormDialog();
diff --git a/doc/html/sql-overview-table3-main-h.html b/doc/html/sql-overview-table3-main-h.html
index 1443144e..b4f2715d 100644
--- a/doc/html/sql-overview-table3-main-h.html
+++ b/doc/html/sql-overview-table3-main-h.html
@@ -53,7 +53,7 @@ body { background: #ffffff; color: black; }
 
 class StatusPicker : public TQComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
     public:
         StatusPicker( TQWidget *parent=0, const char *name=0 );
@@ -66,7 +66,7 @@ class StatusPicker : public TQComboBox
 
 class CustomSqlEditorFactory : public TQSqlEditorFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         TQWidget *createEditor( TQWidget *parent, const TQSqlField *field );
 };
diff --git a/doc/html/sql-overview-table4-main-h.html b/doc/html/sql-overview-table4-main-h.html
index dc5da4d7..883e924e 100644
--- a/doc/html/sql-overview-table4-main-h.html
+++ b/doc/html/sql-overview-table4-main-h.html
@@ -55,7 +55,7 @@ body { background: #ffffff; color: black; }
 
 class StatusPicker : public TQComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
 public:
     StatusPicker( TQWidget *parent=0, const char *name=0 );
@@ -68,7 +68,7 @@ private:
 
 class CustomTable : public TQDataTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CustomTable(
             TQSqlCursor *cursor, bool autoPopulate = FALSE,
@@ -82,7 +82,7 @@ public:
 
 class CustomSqlEditorFactory : public TQSqlEditorFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidget *createEditor( TQWidget *parent, const TQSqlField *field );
 };
diff --git a/doc/html/sql.html b/doc/html/sql.html
index c57f7ab2..4389fe12 100644
--- a/doc/html/sql.html
+++ b/doc/html/sql.html
@@ -1117,7 +1117,7 @@ differences.
 
 
        class FormDialog : public TQDialog
     {
-        Q_OBJECT
+        TQ_OBJECT
         public:
             FormDialog();
             ~FormDialog();
@@ -1216,7 +1216,7 @@ we will only cover the differences here. The full source is in TQLineEdit
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
         public:
             CustomEdit( TQWidget *parent=0, const char *name=0 );
@@ -1297,7 +1297,7 @@ can use a custom editor.
 
 
        class StatusPicker : public TQComboBox
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
         public:
             StatusPicker( TQWidget *parent=0, const char *name=0 );
@@ -1314,7 +1314,7 @@ from the combobox's indexes so we create a TQMap to ma
 to/from the statusids that we will list in the combobox.
 
     
        class CustomSqlEditorFactory : public TQSqlEditorFactory
     {
-        Q_OBJECT
+        TQ_OBJECT
         public:
             TQWidget *createEditor( TQWidget *parent, const TQSqlField *field );
     };
@@ -1376,7 +1376,7 @@ to subclass TQDataTable and reimplement the paintField() function.
 
 
        class CustomTable : public TQDataTable
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         CustomTable(
                 TQSqlCursor *cursor, bool autoPopulate = FALSE,
diff --git a/doc/html/statistics-example.html b/doc/html/statistics-example.html
index 7fb5fa0a..d34279d0 100644
--- a/doc/html/statistics-example.html
+++ b/doc/html/statistics-example.html
@@ -74,7 +74,7 @@ private:
 
 class Table : public TQTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Table();
diff --git a/doc/html/t10-cannon-h.html b/doc/html/t10-cannon-h.html
index 9a665354..40ef1a71 100644
--- a/doc/html/t10-cannon-h.html
+++ b/doc/html/t10-cannon-h.html
@@ -46,7 +46,7 @@ body { background: #ffffff; color: black; }
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t10-lcdrange-h.html b/doc/html/t10-lcdrange-h.html
index 62007182..e16669d5 100644
--- a/doc/html/t10-lcdrange-h.html
+++ b/doc/html/t10-lcdrange-h.html
@@ -48,7 +48,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t11-cannon-cpp.html b/doc/html/t11-cannon-cpp.html
index eeb1104f..88b4a7b1 100644
--- a/doc/html/t11-cannon-cpp.html
+++ b/doc/html/t11-cannon-cpp.html
@@ -179,7 +179,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/doc/html/t11-cannon-h.html b/doc/html/t11-cannon-h.html
index 125408fe..094b63b9 100644
--- a/doc/html/t11-cannon-h.html
+++ b/doc/html/t11-cannon-h.html
@@ -49,7 +49,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t11-lcdrange-h.html b/doc/html/t11-lcdrange-h.html
index 42679631..d23be5af 100644
--- a/doc/html/t11-lcdrange-h.html
+++ b/doc/html/t11-lcdrange-h.html
@@ -48,7 +48,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t12-cannon-cpp.html b/doc/html/t12-cannon-cpp.html
index b2db3338..cd9ad667 100644
--- a/doc/html/t12-cannon-cpp.html
+++ b/doc/html/t12-cannon-cpp.html
@@ -214,7 +214,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/doc/html/t12-cannon-h.html b/doc/html/t12-cannon-h.html
index 4a696f45..dd88c1ad 100644
--- a/doc/html/t12-cannon-h.html
+++ b/doc/html/t12-cannon-h.html
@@ -49,7 +49,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t12-lcdrange-h.html b/doc/html/t12-lcdrange-h.html
index e15e0138..ca80db18 100644
--- a/doc/html/t12-lcdrange-h.html
+++ b/doc/html/t12-lcdrange-h.html
@@ -49,7 +49,7 @@ class TQLabel;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
     LCDRange( const char *s, TQWidget *parent=0,
diff --git a/doc/html/t13-cannon-cpp.html b/doc/html/t13-cannon-cpp.html
index a18df62d..ba28b19f 100644
--- a/doc/html/t13-cannon-cpp.html
+++ b/doc/html/t13-cannon-cpp.html
@@ -240,7 +240,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/doc/html/t13-cannon-h.html b/doc/html/t13-cannon-h.html
index 93c46edc..fbfe7ad7 100644
--- a/doc/html/t13-cannon-h.html
+++ b/doc/html/t13-cannon-h.html
@@ -49,7 +49,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t13-gamebrd-h.html b/doc/html/t13-gamebrd-h.html
index 11ec5e1c..f983d61d 100644
--- a/doc/html/t13-gamebrd-h.html
+++ b/doc/html/t13-gamebrd-h.html
@@ -54,7 +54,7 @@ class CannonField;
 
 class GameBoard : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GameBoard( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t13-lcdrange-h.html b/doc/html/t13-lcdrange-h.html
index c25b5ea2..4f8299a6 100644
--- a/doc/html/t13-lcdrange-h.html
+++ b/doc/html/t13-lcdrange-h.html
@@ -49,7 +49,7 @@ class TQLabel;
 
 class LCDRange : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
     LCDRange( const char *s, TQWidget *parent=0, const char *name=0 );
diff --git a/doc/html/t14-cannon-cpp.html b/doc/html/t14-cannon-cpp.html
index 98ecd47b..6c3bd3b7 100644
--- a/doc/html/t14-cannon-cpp.html
+++ b/doc/html/t14-cannon-cpp.html
@@ -180,7 +180,7 @@ void CannonField::mouseMoveEvent( y() >= height() )
         pnt.setY( height() - 1 );
     double rad = atan(((double)rect().bottom()-pnt.y())/pnt.x());
-    setAngle( qRound ( rad*180/3.14159265 ) );
+    setAngle( tqRound ( rad*180/3.14159265 ) );
 }
 
 
@@ -279,7 +279,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/doc/html/t14-cannon-h.html b/doc/html/t14-cannon-h.html
index df333650..28eb050b 100644
--- a/doc/html/t14-cannon-h.html
+++ b/doc/html/t14-cannon-h.html
@@ -49,7 +49,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t14-gamebrd-h.html b/doc/html/t14-gamebrd-h.html
index d133dcb6..b5f215fb 100644
--- a/doc/html/t14-gamebrd-h.html
+++ b/doc/html/t14-gamebrd-h.html
@@ -54,7 +54,7 @@ class CannonField;
 
 class GameBoard : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GameBoard( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t14-lcdrange-h.html b/doc/html/t14-lcdrange-h.html
index c2adaf32..181cf7db 100644
--- a/doc/html/t14-lcdrange-h.html
+++ b/doc/html/t14-lcdrange-h.html
@@ -49,7 +49,7 @@ class TQLabel;
 
 class LCDRange : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
     LCDRange( const char *s, TQWidget *parent=0, const char *name=0 );
diff --git a/doc/html/t7-lcdrange-h.html b/doc/html/t7-lcdrange-h.html
index d274c040..90e9cbef 100644
--- a/doc/html/t7-lcdrange-h.html
+++ b/doc/html/t7-lcdrange-h.html
@@ -48,7 +48,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t8-cannon-h.html b/doc/html/t8-cannon-h.html
index e0d61782..03808f9b 100644
--- a/doc/html/t8-cannon-h.html
+++ b/doc/html/t8-cannon-h.html
@@ -46,7 +46,7 @@ body { background: #ffffff; color: black; }
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t8-lcdrange-h.html b/doc/html/t8-lcdrange-h.html
index 8c7ddd85..0c3fa65e 100644
--- a/doc/html/t8-lcdrange-h.html
+++ b/doc/html/t8-lcdrange-h.html
@@ -48,7 +48,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t9-cannon-h.html b/doc/html/t9-cannon-h.html
index 0e848733..e84c93db 100644
--- a/doc/html/t9-cannon-h.html
+++ b/doc/html/t9-cannon-h.html
@@ -46,7 +46,7 @@ body { background: #ffffff; color: black; }
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/t9-lcdrange-h.html b/doc/html/t9-lcdrange-h.html
index 6c4ad889..91f1cf12 100644
--- a/doc/html/t9-lcdrange-h.html
+++ b/doc/html/t9-lcdrange-h.html
@@ -48,7 +48,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/tabdialog-example.html b/doc/html/tabdialog-example.html
index 70ba7cac..a520a6d6 100644
--- a/doc/html/tabdialog-example.html
+++ b/doc/html/tabdialog-example.html
@@ -58,7 +58,7 @@ file separated onto different tabs.
 
 class TabDialog : public TQTabDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TabDialog( TQWidget *parent, const char *name, const TQString &_filename );
diff --git a/doc/html/templates.html b/doc/html/templates.html
index a7335e53..624f1208 100644
--- a/doc/html/templates.html
+++ b/doc/html/templates.html
@@ -63,7 +63,7 @@ beginning, without even having to think about design patterns.
 beyond the compiled language's facilities. It does so by generating
 additional C++ code which can be compiled by any standard C++ compiler.
 The moc reads C++ source files. If it finds one or more class
-declarations that contain the "Q_OBJECT" macro, it produces another C++
+declarations that contain the "TQ_OBJECT" macro, it produces another C++
 source file which contains the meta object code for those classes. The
 C++ source file generated by the moc must be compiled and
 linked with the implementation of the class (or it can be
diff --git a/doc/html/themes-example.html b/doc/html/themes-example.html
index 6d5fe271..820ea49a 100644
--- a/doc/html/themes-example.html
+++ b/doc/html/themes-example.html
@@ -2141,7 +2141,7 @@ class TQTabWidget;
 
 class Themes: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Themes( TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel );
diff --git a/doc/html/tictac-example.html b/doc/html/tictac-example.html
index b15ee645..85579a1e 100644
--- a/doc/html/tictac-example.html
+++ b/doc/html/tictac-example.html
@@ -67,7 +67,7 @@ class TQLabel;
 
 class TicTacButton : public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TicTacButton( TQWidget *parent );
     enum Type { Blank, Circle, Cross };
@@ -98,7 +98,7 @@ typedef TQMemArray<int>          TicTacArray;
 
 class TicTacGameBoard : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TicTacGameBoard( int n, TQWidget *parent=0, const char *name=0 );
    ~TicTacGameBoard();
@@ -131,7 +131,7 @@ private:
 
 class TicTacToe : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TicTacToe( int boardSize=3, TQWidget *parent=0, const char *name=0 );
 private slots:
diff --git a/doc/html/timers.html b/doc/html/timers.html
index 0dc2cd56..5494efbf 100644
--- a/doc/html/timers.html
+++ b/doc/html/timers.html
@@ -89,7 +89,7 @@ single-threaded application without blocking the user interface.
 
     class Mandelbrot : public TQObject
     {
-        Q_OBJECT // required for signals/slots
+        TQ_OBJECT // required for signals/slots
     public:
         Mandelbrot( TQObject *parent=0, const char *name );
         ...
diff --git a/doc/html/tooltip-example.html b/doc/html/tooltip-example.html
index 6c85ce2e..18be95c1 100644
--- a/doc/html/tooltip-example.html
+++ b/doc/html/tooltip-example.html
@@ -66,7 +66,7 @@ protected:
 
 class TellMe : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TellMe( TQWidget * parent = 0, const char * name = 0 );
     ~TellMe();
diff --git a/doc/html/trivial-nsplugin-example.html b/doc/html/trivial-nsplugin-example.html
index 0e4f7ba8..6b974096 100644
--- a/doc/html/trivial-nsplugin-example.html
+++ b/doc/html/trivial-nsplugin-example.html
@@ -50,7 +50,7 @@ Implementation:
 #include <ntqmessagebox.h>
 
 class Trivial : public TQNPWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     void mouseReleaseEvent(TQMouseEvent* event)
     {
@@ -68,7 +68,7 @@ public:
 };
 
 class TrivialInstance : public TQNPInstance {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQNPWidget* newWindow()
     {
diff --git a/doc/html/tutorial1-07.html b/doc/html/tutorial1-07.html
index 706ba9ee..8af0bd97 100644
--- a/doc/html/tutorial1-07.html
+++ b/doc/html/tutorial1-07.html
@@ -75,11 +75,11 @@ header file has changed, fewer files need to be recompiled. It can
 often speed up big compilations by a factor of two or more.
 
     
        class LCDRange : public TQVBox
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         LCDRange( TQWidget *parent=0, const char *name=0 );
 
    
-
     Note the Q_OBJECT. This macro must be included in all classes that
+
     Note the TQ_OBJECT. This macro must be included in all classes that
 contain signals and/or slots. If you are curious, it defines the
 functions that are implemented in the
 meta object file.
diff --git a/doc/html/tutorial1-08.html b/doc/html/tutorial1-08.html
index fb88d4bd..a98e8e30 100644
--- a/doc/html/tutorial1-08.html
+++ b/doc/html/tutorial1-08.html
@@ -88,7 +88,7 @@ function using ::qInstallMsgHan
 
 
     
        class CannonField : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         CannonField( TQWidget *parent=0, const char *name=0 );
 
    
diff --git a/doc/html/tutorial1-11.html b/doc/html/tutorial1-11.html
index 1d091f26..0c2da3bf 100644
--- a/doc/html/tutorial1-11.html
+++ b/doc/html/tutorial1-11.html
@@ -185,7 +185,7 @@ the paintEvent() from the previous chapter.
         double y         = y0 + vely*time - 0.5*gravity*time*time;
 
         TQRect r = TQRect( 0, 0, 6, 6 );
-        r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+        r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
         return r;
     }
 
    
@@ -201,8 +201,8 @@ point, we construct a TQRect with size 6x6 and move i
 the point calculated above. In the same operation we convert the
 point into the widget's coordinate system (see The
 Coordinate System).
-
     The qRound() function is an inline function defined in ntqglobal.h (included
-by all other TQt header files). qRound() rounds a double to the closest
+
     The tqRound() function is an inline function defined in ntqglobal.h (included
+by all other TQt header files). tqRound() rounds a double to the closest
 integer.
 
     
     t11/main.cpp
 
    
diff --git a/doc/html/tutorial1-12.html b/doc/html/tutorial1-12.html
index 4db7280e..9c73cd14 100644
--- a/doc/html/tutorial1-12.html
+++ b/doc/html/tutorial1-12.html
@@ -59,7 +59,7 @@ implementation.
 definition.
 
     
        class LCDRange : public TQVBox
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         LCDRange( TQWidget *parent=0, const char *name=0 );
         LCDRange( const char *s, TQWidget *parent=0,
diff --git a/doc/html/tutorial1-13.html b/doc/html/tutorial1-13.html
index b7aa3fcf..102d237b 100644
--- a/doc/html/tutorial1-13.html
+++ b/doc/html/tutorial1-13.html
@@ -224,7 +224,7 @@ which was last seen as MyWidget.
 
     class GameBoard : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         GameBoard( TQWidget *parent=0, const char *name=0 );
 
diff --git a/doc/html/tutorial1-14.html b/doc/html/tutorial1-14.html
index 5a24a0d8..f3d7a909 100644
--- a/doc/html/tutorial1-14.html
+++ b/doc/html/tutorial1-14.html
@@ -121,7 +121,7 @@ coordinate system.
         if ( pnt.y() >= height() )
             pnt.setY( height() - 1 );
         double rad = atan(((double)rect().bottom()-pnt.y())/pnt.x());
-        setAngle( qRound ( rad*180/3.14159265 ) );
+        setAngle( tqRound ( rad*180/3.14159265 ) );
     }
 
    
 
     This is another TQt event handler. It is called when the user already
diff --git a/doc/html/tutorial2-05.html b/doc/html/tutorial2-05.html
index 22d1e7be..8583795f 100644
--- a/doc/html/tutorial2-05.html
+++ b/doc/html/tutorial2-05.html
@@ -42,7 +42,7 @@ conventional document-centric style.
 
 
        class ChartForm: public TQMainWindow
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         enum { MAX_ELEMENTS = 100 };
         enum { MAX_RECENTFILES = 9 }; // Must not exceed 9
@@ -110,7 +110,7 @@ conventional document-centric style.
     };
 
    
 
     We create a ChartForm subclass of TQMainWindow. Our subclass uses
-the Q_OBJECT macro to support TQt's signals and slots mechanism. 
+the TQ_OBJECT macro to support TQt's signals and slots mechanism. 
 
     The public interface is very small; the type of chart being displayed
 can be retrieved, the chart can be marked 'changed' (so that the user
 will be prompted to save on exit), and the chart can be asked to draw
diff --git a/doc/html/tutorial2-06.html b/doc/html/tutorial2-06.html
index baf5493c..762649ab 100644
--- a/doc/html/tutorial2-06.html
+++ b/doc/html/tutorial2-06.html
@@ -237,7 +237,7 @@ with this text item, and provided a getter and setter for this value.
 
 
        class CanvasView : public TQCanvasView
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         CanvasView( TQCanvas *canvas, ElementVector *elements,
                     TQWidget* parent = 0, const char* name = "canvas view",
diff --git a/doc/html/tutorial2-08.html b/doc/html/tutorial2-08.html
index 331ee3db..1e30c2c5 100644
--- a/doc/html/tutorial2-08.html
+++ b/doc/html/tutorial2-08.html
@@ -42,7 +42,7 @@ enter label text and choose a label color for each label.
 
 
        class SetDataForm: public TQDialog
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         SetDataForm( ElementVector *elements, int decimalPlaces,
                      TQWidget *parent = 0, const char *name = "set data form",
diff --git a/doc/html/tutorial2-09.html b/doc/html/tutorial2-09.html
index 52f6678d..4833b690 100644
--- a/doc/html/tutorial2-09.html
+++ b/doc/html/tutorial2-09.html
@@ -41,7 +41,7 @@ apply to all data sets in one place.
 
 
        class OptionsForm : public TQDialog
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         OptionsForm( TQWidget* parent = 0, const char* name = "options form",
                      bool modal = FALSE, WFlags f = 0 );
diff --git a/doc/html/wizard-example.html b/doc/html/wizard-example.html
index 9882fb9c..c7b7b7b7 100644
--- a/doc/html/wizard-example.html
+++ b/doc/html/wizard-example.html
@@ -59,7 +59,7 @@ class TQLabel;
 
 class Wizard : public TQWizard
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Wizard( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/wizard-wizard-h.html b/doc/html/wizard-wizard-h.html
index 638baad7..3faaeec8 100644
--- a/doc/html/wizard-wizard-h.html
+++ b/doc/html/wizard-wizard-h.html
@@ -54,7 +54,7 @@ class TQLabel;
 
 class Wizard : public TQWizard
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Wizard( TQWidget *parent = 0, const char *name = 0 );
diff --git a/doc/html/xform-example.html b/doc/html/xform-example.html
index 7ee9da2b..864f94f5 100644
--- a/doc/html/xform-example.html
+++ b/doc/html/xform-example.html
@@ -79,7 +79,7 @@ public:
 
 class XFormControl : public TQVBox, public ModeNames
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     XFormControl( const TQFont &initialFont, TQWidget *parent=0, const char *name=0 );
    ~XFormControl() {}
@@ -123,7 +123,7 @@ private:
 
 class ShowXForm : public TQWidget, public ModeNames
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ShowXForm( const TQFont &f, TQWidget *parent=0, const char *name=0 );
    ~ShowXForm() {}
@@ -474,7 +474,7 @@ void ShowXForm::showIt()
 
 class XFormCenter : public TQHBox, public ModeNames
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     XFormCenter( TQWidget *parent=0, const char *name=0 );
 public slots:
diff --git a/doc/integration.doc b/doc/integration.doc
index 25b63944..eee5e5db 100644
--- a/doc/integration.doc
+++ b/doc/integration.doc
@@ -154,10 +154,10 @@
   The 'Add MOC' button will add in the custom build step for the selected file
   so that it creates any needed MOC files and it will add these generated
   files to the project. All you need to do to use it is click on a file that
-  has \c Q_OBJECT and click the button. 
+  has \c TQ_OBJECT and click the button. 
 
   You only need to use this button if you added a file that has \c
-  Q_OBJECT in it by hand, you don't need to use this if you used any
+  TQ_OBJECT in it by hand, you don't need to use this if you used any
   of the previously mentioned buttons. It can also be invoked by using
   the Ctrl+Shift+M key combination in Visual Studio.
 
diff --git a/doc/man/man1/moc.1 b/doc/man/man1/moc.1
index 749b3de5..5e524454 100644
--- a/doc/man/man1/moc.1
+++ b/doc/man/man1/moc.1
@@ -116,7 +116,7 @@ like this:
 .in +4
 .nf
 class YourClass : public QObject {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( ... )
     Q_CLASSINFO( ... )
 
@@ -215,7 +215,7 @@ example:
 .in +4
 .nf
 class SomeTemplate : public QFrame {
-    Q_OBJECT
+    TQ_OBJECT
     ....
 signals:
     void bugInMocDetected( int );
@@ -255,7 +255,7 @@ better alternative.  Here is an example of illegal syntax:
 .in +4
 .nf
 class SomeClass : public QObject {
-    Q_OBJECT
+    TQ_OBJECT
     ...
 public slots:
     // illegal
@@ -271,7 +271,7 @@ You can work around this restriction like this:
 typedef void (*ApplyFunctionType)( List *, void * );
 
 class SomeClass : public QObject {
-    Q_OBJECT
+    TQ_OBJECT
     ...
 public slots:
     void apply( ApplyFunctionType, char * );
@@ -296,7 +296,7 @@ sections instead.  Here is an example of the illegal syntax:
 .in +4
 .nf
 class SomeClass : public QObject {
-    Q_OBJECT
+    TQ_OBJECT
     ...
 signals:
     friend class ClassTemplate; // illegal
@@ -358,7 +358,7 @@ Here's an example:
 .in +4
 .nf
 class A {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     class B {
     public slots: // illegal
@@ -389,7 +389,7 @@ sections, where they belong.  Here is an example of the illegal syntax:
 .in +4
 .nf
 class SomeClass : public QObject {
-    Q_OBJECT
+    TQ_OBJECT
 public slots:
     SomeClass( QObject *parent, const char *name )
         : QObject( parent, name ) {} // illegal
@@ -410,7 +410,7 @@ illegal syntax:
 .in +4
 .nf
 class SomeClass : public QObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ...
     // illegal
@@ -425,12 +425,12 @@ public:
 .in -4
 .PP
 Work around this limitation by declaring all properties at the
-beginning of the class declaration, right after Q_OBJECT:
+beginning of the class declaration, right after TQ_OBJECT:
 .PP
 .in +4
 .nf
 class SomeClass : public QObject {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( Priority priority READ priority WRITE setPriority )
     Q_ENUMS( Priority )
 public:
diff --git a/doc/man/man3/qapplication.3qt b/doc/man/man3/qapplication.3qt
index d75fb46b..10d6bb92 100644
--- a/doc/man/man3/qapplication.3qt
+++ b/doc/man/man3/qapplication.3qt
@@ -409,7 +409,7 @@ Inherits QObject.
 .BI "void \fBQ_ASSERT\fR ( bool test )"
 .br
 .ti -1c
-.BI "void \fBQ_CHECK_PTR\fR ( void * p )"
+.BI "void \fBTQ_CHECK_PTR\fR ( void * p )"
 .br
 .ti -1c
 .BI "QtMsgHandler \fBqInstallMsgHandler\fR ( QtMsgHandler h )"
@@ -1705,7 +1705,7 @@ If \fCb\fR is zero, the Q_ASSERT statement will output the following message usi
 .fi
 .PP
 See also qWarning() and Debugging.
-.SH "void Q_CHECK_PTR ( void * p )"
+.SH "void TQ_CHECK_PTR ( void * p )"
 If \fIp\fR is 0, prints a warning message containing the source code file name and line number, saying that the program ran out of memory.
 .PP
 This is really a macro defined in ntqglobal.h.
@@ -1717,12 +1717,12 @@ Example:
         int *a;
 .br
 .br
-        Q_CHECK_PTR( a = new int[80] );  // WRONG!
+        TQ_CHECK_PTR( a = new int[80] );  // WRONG!
 .br
 .br
         a = new (nothrow) int[80];       // Right
 .br
-        Q_CHECK_PTR( a );
+        TQ_CHECK_PTR( a );
 .br
 .fi
 .PP
@@ -1934,7 +1934,7 @@ This function does nothing when Qt is built with \fCQT_NO_DEBUG\fR defined.
 .SH "const char * qVersion ()"
 Returns the Qt version number as a string, for example, "2.3.0" or" 3.0.5".
 .PP
-The \fCQT_VERSION\fR define has the numeric value in the form: 0xmmiibb (m = major, i = minor, b = bugfix). For example, Qt 3.0.5's \fCQT_VERSION\fR is 0x030005.
+The \fCTQT_VERSION\fR define has the numeric value in the form: 0xmmiibb (m = major, i = minor, b = bugfix). For example, Qt 3.0.5's \fCTQT_VERSION\fR is 0x030005.
 .SH "void qWarning ( const char * msg, ... )"
 Prints a warning message \fImsg\fR, or calls the message handler (if it has been installed).
 .PP
diff --git a/doc/man/man3/qaxbindable.3qt b/doc/man/man3/qaxbindable.3qt
index 756b1514..919bb512 100644
--- a/doc/man/man3/qaxbindable.3qt
+++ b/doc/man/man3/qaxbindable.3qt
@@ -56,7 +56,7 @@ The functions provided by this class allow an ActiveX control to communicate pro
 .br
     {
 .br
-        Q_OBJECT
+        TQ_OBJECT
 .br
         Q_PROPERTY( int value READ value WRITE setValue )
 .br
diff --git a/doc/man/man3/qaxobject.3qt b/doc/man/man3/qaxobject.3qt
index 40413832..f1b60674 100644
--- a/doc/man/man3/qaxobject.3qt
+++ b/doc/man/man3/qaxobject.3qt
@@ -53,7 +53,7 @@ A QAxObject can be instantiated as an empty object, with the name of the COM obj
 .PP
 QAxObject is a QObject and can be used as such, e.g. it can be organized in an object hierarchy, receive events and connect to signals and slots.
 .PP
-\fBWarning:\fR You can subclass QAxObject, but you cannot use the Q_OBJECT macro in the subclass (the generated moc-file will not compile), so you cannot add further signals, slots or properties. This limitation is due to the metaobject information generated in runtime. To work around this problem, aggregate the QAxObject as a member of the QObject subclass.
+\fBWarning:\fR You can subclass QAxObject, but you cannot use the TQ_OBJECT macro in the subclass (the generated moc-file will not compile), so you cannot add further signals, slots or properties. This limitation is due to the metaobject information generated in runtime. To work around this problem, aggregate the QAxObject as a member of the QObject subclass.
 .PP
 .SH MEMBER FUNCTION DOCUMENTATION
 .SH "QAxObject::QAxObject ( QObject * parent = 0, const char * name = 0 )"
diff --git a/doc/man/man3/qaxwidget.3qt b/doc/man/man3/qaxwidget.3qt
index 5aaf3c98..c153b3cf 100644
--- a/doc/man/man3/qaxwidget.3qt
+++ b/doc/man/man3/qaxwidget.3qt
@@ -60,7 +60,7 @@ A QAxWidget can be instantiated as an empty object, with the name of the ActiveX
 .PP
 QAxWidget is a QWidget and can be used as such, e.g. it can be organized in a widget hierarchy, receive events or act as an event filter. Standard widget properties, e.g. enabled are supported, but it depends on the ActiveX control to implement support for ambient properties like e.g. palette or font. QAxWidget tries to provide the necessary hints.
 .PP
-\fBWarning:\fR You can subclass QAxWidget, but you cannot use the Q_OBJECT macro in the subclass (the generated moc-file will not compile), so you cannot add further signals, slots or properties. This limitation is due to the metaobject information generated in runtime. To work around this problem, aggregate the QAxWidget as a member of the QObject subclass.
+\fBWarning:\fR You can subclass QAxWidget, but you cannot use the TQ_OBJECT macro in the subclass (the generated moc-file will not compile), so you cannot add further signals, slots or properties. This limitation is due to the metaobject information generated in runtime. To work around this problem, aggregate the QAxWidget as a member of the QObject subclass.
 .PP
 .SH MEMBER FUNCTION DOCUMENTATION
 .SH "QAxWidget::QAxWidget ( QWidget * parent = 0, const char * name = 0, WFlags f = 0 )"
diff --git a/doc/man/man3/qbytearray.3qt b/doc/man/man3/qbytearray.3qt
index 72b3b1e4..071b0ee7 100644
--- a/doc/man/man3/qbytearray.3qt
+++ b/doc/man/man3/qbytearray.3qt
@@ -56,18 +56,18 @@ Constructs a QByteArray of size \fIsize\fR.
 .SH "QByteArray qCompress ( const QByteArray & data )"
 Compresses the array \fIdata\fR and returns the compressed byte array using zlib.
 .PP
-See also qUncompress().
+See also tqUncompress().
 .SH "QByteArray qCompress ( const uchar * data, int nbytes )"
 This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
 .PP
 Compresses the array \fIdata\fR which is \fInbytes\fR long and returns the compressed byte array.
-.SH "QByteArray qUncompress ( const QByteArray & data )"
+.SH "QByteArray tqUncompress ( const QByteArray & data )"
 Uncompresses the array \fIdata\fR and returns the uncompressed byte array.
 .PP
 Returns an empty QByteArray if the input data was corrupt.
 .PP
 See also qCompress().
-.SH "QByteArray qUncompress ( const uchar * data, int nbytes )"
+.SH "QByteArray tqUncompress ( const uchar * data, int nbytes )"
 This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
 .PP
 Uncompresses the array \fIdata\fR which is \fInbytes\fR long and returns
diff --git a/doc/man/man3/qcstring.3qt b/doc/man/man3/qcstring.3qt
index 9e81755c..2b291cfb 100644
--- a/doc/man/man3/qcstring.3qt
+++ b/doc/man/man3/qcstring.3qt
@@ -1054,7 +1054,7 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0.
 .PP
 Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both).
 .PP
-See also qstrncmp(), qstricmp(), qstrnicmp(), and Note on character comparisons.
+See also tqstrncmp(), qstricmp(), qstrnicmp(), and Note on character comparisons.
 .SH "char * qstrcpy ( char * dst, const char * src )"
 A safe strcpy() function.
 .PP
@@ -1076,12 +1076,12 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0.
 .PP
 Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both).
 .PP
-See also qstrcmp(), qstrncmp(), qstrnicmp(), and Note on character comparisons.
-.SH "uint qstrlen ( const char * str )"
+See also qstrcmp(), tqstrncmp(), qstrnicmp(), and Note on character comparisons.
+.SH "uint tqstrlen ( const char * str )"
 A safe strlen function.
 .PP
 Returns the number of characters that precede the terminating '\0'. or 0 if \fIstr\fR is 0.
-.SH "int qstrncmp ( const char * str1, const char * str2, uint len )"
+.SH "int tqstrncmp ( const char * str1, const char * str2, uint len )"
 A safe strncmp() function.
 .PP
 Compares at most \fIlen\fR bytes of \fIstr1\fR and \fIstr2\fR.
@@ -1110,7 +1110,7 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0.
 .PP
 Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both).
 .PP
-See also qstrcmp(), qstrncmp(), qstricmp(), and Note on character comparisons.
+See also qstrcmp(), tqstrncmp(), qstricmp(), and Note on character comparisons.
 
 .SH "SEE ALSO"
 .BR http://doc.trolltech.com/ntqcstring.html
diff --git a/doc/man/man3/qfile.3qt b/doc/man/man3/qfile.3qt
index c47a8fde..841ef89f 100644
--- a/doc/man/man3/qfile.3qt
+++ b/doc/man/man3/qfile.3qt
@@ -372,7 +372,7 @@ Example:
 .br
         f.open( IO_WriteOnly, stderr );
 .br
-        f.writeBlock( msg, qstrlen(msg) );      // write to stderr
+        f.writeBlock( msg, tqstrlen(msg) );      // write to stderr
 .br
         f.close();
 .br
diff --git a/doc/man/man3/qglwidget.3qt b/doc/man/man3/qglwidget.3qt
index a6b94bf6..c1282249 100644
--- a/doc/man/man3/qglwidget.3qt
+++ b/doc/man/man3/qglwidget.3qt
@@ -157,7 +157,7 @@ Here is a rough outline of how a QGLWidget subclass might look:
 .br
     {
 .br
-        Q_OBJECT        // must include this if you use Qt signals/slots
+        TQ_OBJECT        // must include this if you use Qt signals/slots
 .br
 .br
     public:
diff --git a/doc/man/man3/qobject.3qt b/doc/man/man3/qobject.3qt
index 8725b085..f83c0ab1 100644
--- a/doc/man/man3/qobject.3qt
+++ b/doc/man/man3/qobject.3qt
@@ -209,7 +209,7 @@ QObjects can receive events through event() and filter the events of other objec
 .PP
 Last but not least, QObject provides the basic timer support in Qt; see QTimer for high-level support for timers.
 .PP
-Notice that the Q_OBJECT macro is mandatory for any object that implements signals, slots or properties. You also need to run the moc program (Meta Object Compiler) on the source file. We strongly recommend the use of this macro in \fIall\fR subclasses of QObject regardless of whether or not they actually use signals, slots and properties, since failure to do so may lead certain functions to exhibit undefined behaviour.
+Notice that the TQ_OBJECT macro is mandatory for any object that implements signals, slots or properties. You also need to run the moc program (Meta Object Compiler) on the source file. We strongly recommend the use of this macro in \fIall\fR subclasses of QObject regardless of whether or not they actually use signals, slots and properties, since failure to do so may lead certain functions to exhibit undefined behaviour.
 .PP
 All Qt widgets inherit QObject. The convenience function isWidgetType() returns whether an object is actually a widget. It is much faster than inherits( "QWidget" ).
 .PP
@@ -290,7 +290,7 @@ Returns the class name of this object.
 .PP
 This function is generated by the Meta Object Compiler.
 .PP
-\fBWarning:\fR This function will return the wrong name if the class definition lacks the Q_OBJECT macro.
+\fBWarning:\fR This function will return the wrong name if the class definition lacks the TQ_OBJECT macro.
 .PP
 See also name, inherits(), isA(), and isWidgetType().
 .PP
@@ -322,7 +322,7 @@ A signal can also be connected to another signal:
 .br
     {
 .br
-        Q_OBJECT
+        TQ_OBJECT
 .br
     public:
 .br
@@ -741,7 +741,7 @@ See also timerEvent(), startTimer(), and killTimer().
 .SH "QMetaObject * QObject::metaObject () const\fC [virtual]\fR"
 Returns a pointer to the meta object of this object.
 .PP
-A meta object contains information about a class that inherits QObject, e.g. class name, superclass name, properties, signals and slots. Every class that contains the Q_OBJECT macro will also have a meta object.
+A meta object contains information about a class that inherits QObject, e.g. class name, superclass name, properties, signals and slots. Every class that contains the TQ_OBJECT macro will also have a meta object.
 .PP
 The meta object information is required by the signal/slot connection mechanism and the property system. The functions isA() and inherits() also make use of the meta object.
 .SH "const char * QObject::name () const"
@@ -870,7 +870,7 @@ Example:
 .br
     {
 .br
-        Q_OBJECT
+        TQ_OBJECT
 .br
     public:
 .br
@@ -924,7 +924,7 @@ See also startTimer(), killTimer(), killTimers(), and event().
 Examples:
 .)l biff/biff.cpp, dclock/dclock.cpp, forever/forever.cpp, grapher/grapher.cpp, qmag/qmag.cpp, and xform/xform.cpp.
 .SH "QString QObject::tr ( const char * sourceText, const char * comment )\fC [static]\fR"
-Returns a translated version of \fIsourceText\fR, or \fIsourceText\fR itself if there is no appropriate translated version. The translation context is QObject with \fIcomment\fR (0 by default). All QObject subclasses using the Q_OBJECT macro automatically have a reimplementation of this function with the subclass name as context.
+Returns a translated version of \fIsourceText\fR, or \fIsourceText\fR itself if there is no appropriate translated version. The translation context is QObject with \fIcomment\fR (0 by default). All QObject subclasses using the TQ_OBJECT macro automatically have a reimplementation of this function with the subclass name as context.
 .PP
 \fBWarning:\fR This method is reentrant only if all translators are installed \fIbefore\fR calling this method. Installing or removing translators while performing translations is not supported. Doing so will probably result in crashes or other undesirable behavior.
 .PP
diff --git a/doc/man/man3/qspinbox.3qt b/doc/man/man3/qspinbox.3qt
index 0d4d34d7..f4b92223 100644
--- a/doc/man/man3/qspinbox.3qt
+++ b/doc/man/man3/qspinbox.3qt
@@ -224,7 +224,7 @@ For example, these functions could be changed so that the user provided values f
 .br
         {
 .br
-            Q_OBJECT
+            TQ_OBJECT
 .br
         public:
 .br
diff --git a/doc/man/man3/qvaluelist.3qt b/doc/man/man3/qvaluelist.3qt
index 43cfe8fd..c42a7677 100644
--- a/doc/man/man3/qvaluelist.3qt
+++ b/doc/man/man3/qvaluelist.3qt
@@ -333,7 +333,7 @@ Notice that the latest changes to Mary's salary did not affect the value in the
 .PP
 There are several ways to find items in the list. The begin() and end() functions return iterators to the beginning and end of the list. The advantage of getting an iterator is that you can move forward or backward from this position by incrementing/decrementing the iterator. The iterator returned by end() points to the item which is one \fIpast\fR the last item in the container. The past-the-end iterator is still associated with the list it belongs to, however it is \fInot\fR dereferenceable; operator*() will not return a well-defined value. If the list is empty(), the iterator returned by begin() will equal the iterator returned by end().
 .PP
-Another way to find an item in the list is by using the qFind() algorithm. For example:
+Another way to find an item in the list is by using the tqFind() algorithm. For example:
 .PP
 .nf
 .br
@@ -341,7 +341,7 @@ Another way to find an item in the list is by using the qFind() algorithm. For e
 .br
     ...
 .br
-    QValueList::iterator it = qFind( list.begin(), list.end(), 3 );
+    QValueList::iterator it = tqFind( list.begin(), list.end(), 3 );
 .br
     if ( it != list.end() )
 .br
diff --git a/doc/man/man3/qvaluevector.3qt b/doc/man/man3/qvaluevector.3qt
index 4c0fd516..8999a4be 100644
--- a/doc/man/man3/qvaluevector.3qt
+++ b/doc/man/man3/qvaluevector.3qt
@@ -337,7 +337,7 @@ Whenever inserting, removing or referencing elements in a vector, always make su
 .PP
 The iterators provided by vector are random access iterators, therefore you can use them with many generic algorithms, for example, algorithms provided by the STL or the QTL.
 .PP
-Another way to find an element in the vector is by using the std::find() or qFind() algorithms. For example:
+Another way to find an element in the vector is by using the std::find() or tqFind() algorithms. For example:
 .PP
 .nf
 .br
@@ -345,7 +345,7 @@ Another way to find an element in the vector is by using the std::find() or qFin
 .br
     ...
 .br
-    QValueVector::const_iterator it = qFind( vec.begin(), vec.end(), 3 );
+    QValueVector::const_iterator it = tqFind( vec.begin(), vec.end(), 3 );
 .br
     if ( it != vector.end() )
 .br
diff --git a/doc/metaobjects.doc b/doc/metaobjects.doc
index e53c95e0..79c568b7 100644
--- a/doc/metaobjects.doc
+++ b/doc/metaobjects.doc
@@ -42,7 +42,7 @@
 \title Meta Object System
 
 \keyword meta object
-\keyword Q_OBJECT
+\keyword TQ_OBJECT
 
 Qt's Meta Object System provides the signals and slots mechanism for
 inter-object communication, runtime type information, and the dynamic
@@ -51,15 +51,15 @@ property system.
 The Meta Object System is based on three things:
 \list 1
 \i the \l QObject class;
-\i the Q_OBJECT macro inside the private section of the class
+\i the TQ_OBJECT macro inside the private section of the class
 declaration;
 \i the \link moc.html Meta Object Compiler (moc)\endlink. 
 \endlist
 
 The \e moc reads a C++ source file. If it finds one or more class
-declarations that contain the Q_OBJECT macro, it produces another C++
+declarations that contain the TQ_OBJECT macro, it produces another C++
 source file which contains the meta object code for the classes that
-contain the Q_OBJECT macro. This generated source file is either
+contain the TQ_OBJECT macro. This generated source file is either
 #included into the class's source file or compiled and linked with the
 class's implementation.
 
@@ -95,14 +95,14 @@ class.
 \endlist
 
 While it is possible to use QObject as a base class without the
-Q_OBJECT macro and without meta object code, neither signals and slots
+TQ_OBJECT macro and without meta object code, neither signals and slots
 nor the other features described here will be available if the
-Q_OBJECT macro is not used. From the meta object system's point of
+TQ_OBJECT macro is not used. From the meta object system's point of
 view, a QObject subclass without meta code is equivalent to its
 closest ancestor with meta object code. This means for example, that
 className() will not return the actual name of your class, but the
 class name of this ancestor. We \e strongly recommend that all
-subclasses of QObject use the Q_OBJECT macro regardless of whether
+subclasses of QObject use the TQ_OBJECT macro regardless of whether
 they actually use signals, slots and properties or not.
 
 */
diff --git a/doc/misc.doc b/doc/misc.doc
index 1b65184b..3bcd98a7 100644
--- a/doc/misc.doc
+++ b/doc/misc.doc
@@ -65,7 +65,7 @@ machine\endlink
 \target linkerror
 \section1 Link error, complaining about a lack of \c vtbl, \c _vtbl, \c __vtbl or similar
 
-This indicates that you've included the Q_OBJECT macro in a class
+This indicates that you've included the TQ_OBJECT macro in a class
 declaration and probably also run the moc, but forgot to link the
 moc-generated object code into your executable. See \link moc.html
 Using the Meta Object Compiler\endlink for details on how to use moc.
diff --git a/doc/moc.doc b/doc/moc.doc
index f017a66e..53f36f28 100644
--- a/doc/moc.doc
+++ b/doc/moc.doc
@@ -50,9 +50,9 @@ The Meta Object Compiler, moc among friends, is the program which
 handles Qt's \link metaobjects.html C++ extensions.\endlink
 
 The moc reads a C++ source file. If it finds one or more class
-declarations that contain the Q_OBJECT macro, it produces another
+declarations that contain the TQ_OBJECT macro, it produces another
 C++ source file which contains the meta object code for the classes
-that use the Q_OBJECT macro. Among other things, meta object code is
+that use the TQ_OBJECT macro. Among other things, meta object code is
 required for the signal/slot mechanism, runtime type information and
 the dynamic property system.
 
@@ -74,7 +74,7 @@ like this:
 \code
     class MyClass : public QObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         MyClass( QObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -100,7 +100,7 @@ function \c setPriority().
 \code
     class MyClass : public QObject
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( Priority priority READ priority WRITE setPriority )
         Q_ENUMS( Priority )
     public:
@@ -121,7 +121,7 @@ attach additional name/value-pairs to the class' meta object:
 \code
     class MyClass : public QObject
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_CLASSINFO( "Author", "Oscar Peterson")
         Q_CLASSINFO( "Status", "Active")
     public:
@@ -171,7 +171,7 @@ it is not necessary to compile and link it separately, as in Method A.
 
 Method A is the normal method. Method B can be used in cases where you
 want the implementation file to be self-contained, or in cases where
-the Q_OBJECT class is implementation-internal and thus should not be
+the TQ_OBJECT class is implementation-internal and thus should not be
 visible in the header file.
 
 
@@ -190,7 +190,7 @@ Makefile that does all the necessary moc handling.
 If you want to create your Makefiles yourself, here are some tips on
 how to include moc handling.
 
-For Q_OBJECT class declarations in header files, here is a useful
+For TQ_OBJECT class declarations in header files, here is a useful
 makefile rule if you only use GNU make:
 
 \code
@@ -214,7 +214,7 @@ You must also remember to add \e moc_NAME.cpp to your SOURCES
 care, so you can use .C, .cc, .CC, .cxx or even .c++ if you
 prefer.)
 
-For Q_OBJECT class declarations in implementation (.cpp) files, we
+For TQ_OBJECT class declarations in implementation (.cpp) files, we
 suggest a makefile rule like this:
 
 \code
@@ -286,7 +286,7 @@ MOC_SKIP_END.
 \section1 Diagnostics
 
 The moc will warn you about a number of dangerous or illegal
-constructs in the Q_OBJECT class declarations.
+constructs in the TQ_OBJECT class declarations.
 
 If you get linkage errors in the final building phase of your
 program, saying that YourClass::className() is undefined or that
@@ -306,7 +306,7 @@ templates cannot have signals or slots. Here is an example:
 
 \code
     class SomeTemplate : public QFrame {
-        Q_OBJECT
+        TQ_OBJECT
 	...
     signals:
         void bugInMocDetected( int );
@@ -341,7 +341,7 @@ Here is an example of illegal syntax:
 
 \code
     class SomeClass : public QObject {
-        Q_OBJECT
+        TQ_OBJECT
 	...
     public slots:
 	// illegal
@@ -354,7 +354,7 @@ You can work around this restriction like this:
     typedef void (*ApplyFunctionType)( List *, void * );
 
     class SomeClass : public QObject {
-        Q_OBJECT
+        TQ_OBJECT
 	...
     public slots:
         void apply( ApplyFunctionType, char * );
@@ -373,7 +373,7 @@ illegal syntax:
 
 \code
     class SomeClass : public QObject {
-        Q_OBJECT
+        TQ_OBJECT
 	...
     signals:
         friend class ClassTemplate; // WRONG
@@ -437,7 +437,7 @@ Here's an example:
 
 \code
     class A {
-	Q_OBJECT
+	TQ_OBJECT
     public:
         class B {
 	public slots:   // WRONG
@@ -462,7 +462,7 @@ of the illegal syntax:
 
 \code
     class SomeClass : public QObject {
-	Q_OBJECT
+	TQ_OBJECT
     public slots:
 	SomeClass( QObject *parent, const char *name )
 	    : QObject( parent, name ) { } // WRONG
@@ -481,7 +481,7 @@ illegal syntax:
 
 \code
     class SomeClass : public QObject {
-        Q_OBJECT
+        TQ_OBJECT
     public:
 	...
         Q_PROPERTY( Priority priority READ priority WRITE setPriority ) // WRONG
@@ -494,11 +494,11 @@ illegal syntax:
 \endcode
 
 Work around this limitation by declaring all properties at the
-beginning of the class declaration, right after Q_OBJECT:
+beginning of the class declaration, right after TQ_OBJECT:
 
 \code
     class SomeClass : public QObject {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( Priority priority READ priority WRITE setPriority )
         Q_ENUMS( Priority )
     public:
diff --git a/doc/object.doc b/doc/object.doc
index 4ff1e98a..cd8ffb27 100644
--- a/doc/object.doc
+++ b/doc/object.doc
@@ -154,7 +154,7 @@ single-threaded application without blocking the user interface.
 
     class Mandelbrot : public QObject
     {
-	Q_OBJECT // required for signals/slots
+	TQ_OBJECT // required for signals/slots
     public:
 	Mandelbrot( QObject *parent=0, const char *name );
 	...
@@ -290,7 +290,7 @@ functions in use:
 \code
     class MyClass : public QObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         MyClass( QObject * parent=0, const char * name=0 );
         ~MyClass();
@@ -341,7 +341,7 @@ final class declaration including the property related declarations:
 \code
     class MyClass : public QObject
     {
-        Q_OBJECT
+        TQ_OBJECT
         Q_PROPERTY( Priority priority READ priority WRITE setPriority )
         Q_ENUMS( Priority )
     public:
@@ -650,7 +650,7 @@ Qt's moc (Meta Object Compiler) provides a clean way to go
 beyond the compiled language's facilities. It does so by generating
 additional C++ code which can be compiled by any standard C++ compiler.
 The moc reads C++ source files. If it finds one or more class
-declarations that contain the "Q_OBJECT" macro, it produces another C++
+declarations that contain the "TQ_OBJECT" macro, it produces another C++
 source file which contains the meta object code for those classes. The
 C++ source file generated by the moc must be compiled and
 linked with the implementation of the class (or it can be
diff --git a/doc/porting3.doc b/doc/porting3.doc
index 83bc9c9f..e7e4d519 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -171,7 +171,7 @@ but source compatibility should not be affected if the macro variable
 
 \list
 \i \c ASSERT becomes \c Q_ASSERT
-\i \c CHECK_PTR becomes \c Q_CHECK_PTR
+\i \c CHECK_PTR becomes \c TQ_CHECK_PTR
 \endlist
 
 For the record, undocumented macro variables that are not part of the API
@@ -344,10 +344,10 @@ new code.
 Additionally, these preprocessor directives have been removed:
 
 \list
-\i \c {#define strlen qstrlen}
+\i \c {#define strlen tqstrlen}
 \i \c {#define strcpy qstrcpy}
 \i \c {#define strcmp qstrcmp}
-\i \c {#define strncmp qstrncmp}
+\i \c {#define strncmp tqstrncmp}
 \i \c {#define stricmp qstricmp}
 \i \c {#define strnicmp qstrnicmp}
 \endlist
diff --git a/doc/qtl.doc b/doc/qtl.doc
index 59162154..42eee39c 100644
--- a/doc/qtl.doc
+++ b/doc/qtl.doc
@@ -181,20 +181,20 @@ your data's class.
 
 Naturally, the sorting templates won't work with const iterators.
 
-\target qSwap
-\section2 qSwap()
+\target tqSwap
+\section2 tqSwap()
 
-qSwap() exchanges the values of two variables:
+tqSwap() exchanges the values of two variables:
 \code
     QString second( "Einstein" );
     QString name( "Albert" );
-    qSwap( second, name );
+    tqSwap( second, name );
 \endcode
 
-\target qCount
-\section2 qCount()
+\target tqCount
+\section2 tqCount()
 
-The qCount() template function counts the number of occurrences of a
+The tqCount() template function counts the number of occurrences of a
 value within a container. For example:
 \code
     QValueList list;
@@ -203,13 +203,13 @@ value within a container. For example:
     list.push_back( 1 );	       
     list.push_back( 2 );	       
     int c = 0;
-    qCount( list.begin(), list.end(), 1, c ); // c == 3
+    tqCount( list.begin(), list.end(), 1, c ); // c == 3
 \endcode	
 
-\target qFind
-\section2 qFind()
+\target tqFind
+\section2 tqFind()
 
-The qFind() template function finds the first occurrence of a value
+The tqFind() template function finds the first occurrence of a value
 within a container. For example:
 \code
     QValueList list;
@@ -217,23 +217,23 @@ within a container. For example:
     list.push_back( 1 );	       
     list.push_back( 1 );	       
     list.push_back( 2 );	       
-    QValueListIterator it = qFind( list.begin(), list.end(), 2 );
+    QValueListIterator it = tqFind( list.begin(), list.end(), 2 );
 \endcode	
 
-\target qFill
-\section2 qFill()
+\target tqFill
+\section2 tqFill()
 
-The qFill() template function fills a range with copies of a value.
+The tqFill() template function fills a range with copies of a value.
 For example:
 \code
     QValueVector vec(3);
-    qFill( vec.begin(), vec.end(), 99 ); // vec contains 99, 99, 99
+    tqFill( vec.begin(), vec.end(), 99 ); // vec contains 99, 99, 99
 \endcode
 
-\target qEqual
-\section2 qEqual()
+\target tqEqual
+\section2 tqEqual()
 
-The qEqual() template function compares two ranges for equality of
+The tqEqual() template function compares two ranges for equality of
 their elements. Note that the number of elements in each range is not
 considered, only if the elements in the first range are equal to the
 corresponding elements in the second range (consequently, both ranges
@@ -251,14 +251,14 @@ must be valid). For example:
     v2[4] = 4;
     v2[5] = 5;
 
-    bool b = qEqual( v1.begin(), v2.end(), v2.begin() );
+    bool b = tqEqual( v1.begin(), v2.end(), v2.begin() );
     // b == TRUE
 \endcode
 
-\target qCopy
-\section2 qCopy()
+\target tqCopy
+\section2 tqCopy()
 
-The qCopy() template function copies a range of elements to an
+The tqCopy() template function copies a range of elements to an
 OutputIterator, in this case a QTextOStreamIterator:
 \code
     QValueList list;
@@ -266,7 +266,7 @@ OutputIterator, in this case a QTextOStreamIterator:
     list.push_back( 200 );
     list.push_back( 300 );
     QTextOStream str( stdout );
-    qCopy( list.begin(), list.end(), QTextOStreamIterator(str) );
+    tqCopy( list.begin(), list.end(), QTextOStreamIterator(str) );
 \endcode
 
 \omit
@@ -281,14 +281,14 @@ into the end of a container. For example:
     l.push_back( 200 );
     l.push_back( 300 );
     QValueVector v;
-    qCopy( l.begin(), l.end(), qBackInserter(v) );
+    tqCopy( l.begin(), l.end(), qBackInserter(v) );
 \endcode
 \endomit
 
-\target qCopyBackward
-\section2 qCopyBackward()
+\target tqCopyBackward
+\section2 tqCopyBackward()
 
-The qCopyBackward() template function copies a container or a slice of
+The tqCopyBackward() template function copies a container or a slice of
 a container to an OutputIterator, but in reverse order, for example:
 \code
     QValueVector vec(3);
@@ -296,7 +296,7 @@ a container to an OutputIterator, but in reverse order, for example:
     vec.push_back( 200 );
     vec.push_back( 300 );
     QValueVector another;
-    qCopyBackward( vec.begin(), vec.end(), another.begin() );
+    tqCopyBackward( vec.begin(), vec.end(), another.begin() );
     // 'another' now contains 100, 200, 300
     // however the elements are copied one at a time 
     // in reverse order (300, 200, then 100)
@@ -313,10 +313,10 @@ illustrates this:
     QStringList list1, list2;
     list1 << "Weis" << "Ettrich" << "Arnt" << "Sue";
     list2 << "Torben" << "Matthias";
-    qCopy( list2.begin(), list2.end(), list1.begin() );
+    tqCopy( list2.begin(), list2.end(), list1.begin() );
 
     QValueVector vec( list1.size(), "Dave" );
-    qCopy( list2.begin(), list2.end(), vec.begin() );
+    tqCopy( list2.begin(), list2.end(), vec.begin() );
 \endcode
 
 At the end of this code fragment, the list list1 contains "Torben",
@@ -327,12 +327,12 @@ overwritten. The vector vec contains "Torben", "Matthias", "Dave" and
 If you write new algorithms, consider writing them as template
 functions in order to make them usable with as many containers
 as possible. In the above example, you could just as easily print out
-a standard C++ array with qCopy():
+a standard C++ array with tqCopy():
 
 \code
     int arr[] = { 100, 200, 300 };
     QTextOStream str( stdout );
-    qCopy( arr, arr + 3, QTextOStreamIterator( str ) );	
+    tqCopy( arr, arr + 3, QTextOStreamIterator( str ) );	
 \endcode
 
 \section1 Streaming
diff --git a/doc/qvaluelist.doc b/doc/qvaluelist.doc
index 287513be..9e573c81 100644
--- a/doc/qvaluelist.doc
+++ b/doc/qvaluelist.doc
@@ -154,12 +154,12 @@
     returned by end().
 
     Another way to find an item in the list is by using the \link
-    ntqtl.html#qFind qFind()\endlink algorithm. For example:
+    ntqtl.html#qFind tqFind()\endlink algorithm. For example:
 
     \code
     QValueList list;
     ...
-    QValueList::iterator it = qFind( list.begin(), list.end(), 3 );
+    QValueList::iterator it = tqFind( list.begin(), list.end(), 3 );
     if ( it != list.end() )
 	// it points to the found item
     \endcode
diff --git a/doc/qvaluevector.doc b/doc/qvaluevector.doc
index c0098c73..770a5995 100644
--- a/doc/qvaluevector.doc
+++ b/doc/qvaluevector.doc
@@ -197,13 +197,13 @@
     QTL\endlink. 
 
     Another way to find an element in the vector is by using the
-    std::find() or \link ntqtl.html#qFind qFind()\endlink algorithms.
+    std::find() or \link ntqtl.html#qFind tqFind()\endlink algorithms.
     For example:
 
     \code
     QValueVector vec;
     ...
-    QValueVector::const_iterator it = qFind( vec.begin(), vec.end(), 3 );
+    QValueVector::const_iterator it = tqFind( vec.begin(), vec.end(), 3 );
     if ( it != vector.end() )
 	// 'it' points to the found element
     \endcode
diff --git a/doc/signalsandslots.doc b/doc/signalsandslots.doc
index 55111489..e746f405 100644
--- a/doc/signalsandslots.doc
+++ b/doc/signalsandslots.doc
@@ -130,7 +130,7 @@ A small Qt class might read:
 \code
     class Foo : public QObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	Foo();
 	int value() const { return val; }
@@ -149,7 +149,7 @@ signals and slots: this class can tell the outside world that its state
 has changed by emitting a signal, \c{valueChanged()}, and it has
 a slot which other objects can send signals to.
 
-All classes that contain signals or slots must mention Q_OBJECT in
+All classes that contain signals or slots must mention TQ_OBJECT in
 their declaration.
 
 Slots are implemented by the application programmer.
@@ -335,10 +335,10 @@ declarations.
 
 \code
     {
-	Q_OBJECT
+	TQ_OBJECT
 \endcode
 
-Q_OBJECT is expanded by the preprocessor to declare several member
+TQ_OBJECT is expanded by the preprocessor to declare several member
 functions that are implemented by the moc; if you get compiler errors
 along the lines of "virtual function QButton::className not defined"
 you have probably forgotten to \link moc.html run the moc\endlink or to
diff --git a/doc/tutorial.doc b/doc/tutorial.doc
index 0896a925..c015928c 100644
--- a/doc/tutorial.doc
+++ b/doc/tutorial.doc
@@ -726,7 +726,7 @@ often speed up big compilations by a factor of two or more.
 \skipto LCDRange
 \printuntil parent=0
 
-Note the Q_OBJECT. This macro must be included in \e all classes that
+Note the TQ_OBJECT. This macro must be included in \e all classes that
 contain signals and/or slots. If you are curious, it defines the
 functions that are implemented in the
 \link metaobjects.html meta object file \endlink.
@@ -1654,8 +1654,8 @@ the point calculated above. In the same operation we convert the
 point into the widget's coordinate system (see \link coordsys.html The
 Coordinate System\endlink).
 
-The qRound() function is an inline function defined in ntqglobal.h (included
-by all other Qt header files). qRound() rounds a double to the closest
+The tqRound() function is an inline function defined in ntqglobal.h (included
+by all other Qt header files). tqRound() rounds a double to the closest
 integer.
 
 \section2 \l t11/main.cpp
diff --git a/doc/tutorial2.doc b/doc/tutorial2.doc
index 12756b1d..4291ffe6 100644
--- a/doc/tutorial2.doc
+++ b/doc/tutorial2.doc
@@ -366,7 +366,7 @@ conventional document-centric style.
 \printuntil };
 
 We create a \c ChartForm subclass of QMainWindow. Our subclass uses
-the \c Q_OBJECT macro to support Qt's \link signalsandslots.html
+the \c TQ_OBJECT macro to support Qt's \link signalsandslots.html
 signals and slots\endlink mechanism. 
 
 The public interface is very small; the type of chart being displayed
diff --git a/examples/aclock/aclock.h b/examples/aclock/aclock.h
index e28c6528..f786363a 100644
--- a/examples/aclock/aclock.h
+++ b/examples/aclock/aclock.h
@@ -16,7 +16,7 @@
 class TQTimer;
 class AnalogClock : public TQWidget		// analog clock widget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AnalogClock( TQWidget *parent=0, const char *name=0 );
     void setAutoMask(bool b);
diff --git a/examples/action/application.h b/examples/action/application.h
index 06620533..b3e864ea 100644
--- a/examples/action/application.h
+++ b/examples/action/application.h
@@ -16,7 +16,7 @@ class TQTextEdit;
 
 class ApplicationWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ApplicationWindow();
diff --git a/examples/addressbook/centralwidget.h b/examples/addressbook/centralwidget.h
index cf190d47..7f2018c6 100644
--- a/examples/addressbook/centralwidget.h
+++ b/examples/addressbook/centralwidget.h
@@ -23,7 +23,7 @@ class TQCheckBox;
 
 class ABCentralWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ABCentralWidget( TQWidget *parent, const char *name = 0 );
diff --git a/examples/addressbook/mainwindow.h b/examples/addressbook/mainwindow.h
index e3a453ea..631d82a7 100644
--- a/examples/addressbook/mainwindow.h
+++ b/examples/addressbook/mainwindow.h
@@ -19,7 +19,7 @@ class ABCentralWidget;
 
 class ABMainWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ABMainWindow();
diff --git a/examples/application/application.h b/examples/application/application.h
index 06620533..b3e864ea 100644
--- a/examples/application/application.h
+++ b/examples/application/application.h
@@ -16,7 +16,7 @@ class TQTextEdit;
 
 class ApplicationWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ApplicationWindow();
diff --git a/examples/biff/biff.h b/examples/biff/biff.h
index eed7dc08..ae60b43a 100644
--- a/examples/biff/biff.h
+++ b/examples/biff/biff.h
@@ -17,7 +17,7 @@
 
 class Biff : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Biff( TQWidget *parent=0, const char *name=0 );
 
diff --git a/examples/buttongroups/buttongroups.h b/examples/buttongroups/buttongroups.h
index 93830499..c25415bf 100644
--- a/examples/buttongroups/buttongroups.h
+++ b/examples/buttongroups/buttongroups.h
@@ -17,7 +17,7 @@ class TQRadioButton;
 
 class ButtonsGroups : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ButtonsGroups( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/canvas/canvas.h b/examples/canvas/canvas.h
index cc269037..5bbb5088 100644
--- a/examples/canvas/canvas.h
+++ b/examples/canvas/canvas.h
@@ -17,7 +17,7 @@ public:
 
 
 class FigureEditor : public TQCanvasView {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FigureEditor(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0);
@@ -36,7 +36,7 @@ private:
 };
 
 class Main : public TQMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Main(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0);
diff --git a/examples/chart/canvasview.h b/examples/chart/canvasview.h
index d51ba6b5..a066c1b1 100644
--- a/examples/chart/canvasview.h
+++ b/examples/chart/canvasview.h
@@ -12,7 +12,7 @@ class TQPoint;
 
 class CanvasView : public TQCanvasView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CanvasView( TQCanvas *canvas, ElementVector *elements,
 		TQWidget* parent = 0, const char* name = "canvas view",
diff --git a/examples/chart/chartform.h b/examples/chart/chartform.h
index b2d30c01..926bd69b 100644
--- a/examples/chart/chartform.h
+++ b/examples/chart/chartform.h
@@ -18,7 +18,7 @@ class TQString;
 
 class ChartForm: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum { MAX_ELEMENTS = 100 };
     enum { MAX_RECENTFILES = 9 }; // Must not exceed 9
diff --git a/examples/chart/optionsform.h b/examples/chart/optionsform.h
index c160f777..8277ad37 100644
--- a/examples/chart/optionsform.h
+++ b/examples/chart/optionsform.h
@@ -17,7 +17,7 @@ class TQVBoxLayout;
 
 class OptionsForm : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     OptionsForm( TQWidget* parent = 0, const char* name = "options form",
 		 bool modal = FALSE, WFlags f = 0 );
diff --git a/examples/chart/setdataform.h b/examples/chart/setdataform.h
index 88eb98f9..7759f615 100644
--- a/examples/chart/setdataform.h
+++ b/examples/chart/setdataform.h
@@ -13,7 +13,7 @@ class TQVBoxLayout;
 
 class SetDataForm: public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SetDataForm( ElementVector *elements, int decimalPlaces,
 		 TQWidget *parent = 0, const char *name = "set data form",
diff --git a/examples/checklists/checklists.h b/examples/checklists/checklists.h
index 5235f830..d2097dd1 100644
--- a/examples/checklists/checklists.h
+++ b/examples/checklists/checklists.h
@@ -17,7 +17,7 @@ class TQLabel;
 
 class CheckLists : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CheckLists( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/dclock/dclock.h b/examples/dclock/dclock.h
index a98a6965..bffaab21 100644
--- a/examples/dclock/dclock.h
+++ b/examples/dclock/dclock.h
@@ -15,7 +15,7 @@
 
 class DigitalClock : public TQLCDNumber		// digital clock widget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DigitalClock( TQWidget *parent=0, const char *name=0 );
 
diff --git a/examples/demo/categoryinterface.h b/examples/demo/categoryinterface.h
index 978e1380..a51018a6 100644
--- a/examples/demo/categoryinterface.h
+++ b/examples/demo/categoryinterface.h
@@ -9,7 +9,7 @@ class TQWidgetStack;
 
 class CategoryInterface : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CategoryInterface( TQWidgetStack *s ) : stack( s ) {}
diff --git a/examples/demo/display.h b/examples/demo/display.h
index 3a86e236..c3241150 100644
--- a/examples/demo/display.h
+++ b/examples/demo/display.h
@@ -24,7 +24,7 @@ class Screen;
 class Curve;
 
 class DisplayWidget : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DisplayWidget( TQWidget *parent=0, const char *name=0 );
 
@@ -51,7 +51,7 @@ private:
 };
 
 class Screen : public TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum { FrameWidth = 3 };
     Screen( TQWidget *parent=0, const char *name=0 );
@@ -74,7 +74,7 @@ private:
 };
 
 class Curve : public TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
     enum { FrameWidth = 3 };
 public:
     Curve( TQWidget *parent=0, const char *name=0 );
diff --git a/examples/demo/dnd/dnd.h b/examples/demo/dnd/dnd.h
index 7860cac5..05d0587c 100644
--- a/examples/demo/dnd/dnd.h
+++ b/examples/demo/dnd/dnd.h
@@ -25,7 +25,7 @@ private:
 
 class DnDDemo : public DnDDemoBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DnDDemo( TQWidget* parent = 0, const char* name = 0 );
diff --git a/examples/demo/dnd/iconview.h b/examples/demo/dnd/iconview.h
index b02949a8..3a5ee29c 100644
--- a/examples/demo/dnd/iconview.h
+++ b/examples/demo/dnd/iconview.h
@@ -18,7 +18,7 @@ private:
 
 class IconView : public TQIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     IconView( TQWidget* parent = 0, const char* name = 0 );
diff --git a/examples/demo/dnd/listview.h b/examples/demo/dnd/listview.h
index c4574951..f82f2cb3 100644
--- a/examples/demo/dnd/listview.h
+++ b/examples/demo/dnd/listview.h
@@ -17,7 +17,7 @@ private:
 
 class ListView : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListView( TQWidget* parent = 0, const char* name = 0 );
diff --git a/examples/demo/dnd/styledbutton.h b/examples/demo/dnd/styledbutton.h
index ae99f5cf..2cd6c0ae 100644
--- a/examples/demo/dnd/styledbutton.h
+++ b/examples/demo/dnd/styledbutton.h
@@ -42,7 +42,7 @@ class TQBrush;
 
 class StyledButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( TQColor color READ color WRITE setColor )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
diff --git a/examples/demo/frame.h b/examples/demo/frame.h
index 4097692a..6a2ede5c 100644
--- a/examples/demo/frame.h
+++ b/examples/demo/frame.h
@@ -17,7 +17,7 @@ class TQWidgetStack;
 
 class Frame : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Frame( TQWidget *parent=0, const char *name=0 );
diff --git a/examples/demo/graph.h b/examples/demo/graph.h
index 58221b8b..1cb0f501 100644
--- a/examples/demo/graph.h
+++ b/examples/demo/graph.h
@@ -17,7 +17,7 @@ class GraphWidgetPrivate;
 
 class GraphWidget : public TQWidget 
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GraphWidget( TQWidget *parent=0, const char *name=0 );
     ~GraphWidget();
diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp
index 79f92826..1fba8925 100644
--- a/examples/demo/i18n/i18n.cpp
+++ b/examples/demo/i18n/i18n.cpp
@@ -137,7 +137,7 @@ void I18nDemo::newSlot(int id)
 		   "portability across Windows 95/98/NT/2000, Mac OS X, Linux, Solaris, "
 		   "HP-UX and many other versions of Unix with X11.
    "
 		   "
    See http://www.trolltech.com/qt/ for more "
-		   "information.
    ").arg(QT_VERSION_STR));
+		   "information.
    ").arg(TQT_VERSION_STR));
 
     qApp->removeTranslator(&wrapper->translator);
 
diff --git a/examples/demo/i18n/i18n.h b/examples/demo/i18n/i18n.h
index 29663e1f..b716fc04 100644
--- a/examples/demo/i18n/i18n.h
+++ b/examples/demo/i18n/i18n.h
@@ -11,7 +11,7 @@ class Wrapper;
 
 class I18nDemo : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     I18nDemo(TQWidget *, const char * = 0);
diff --git a/examples/demo/main.cpp b/examples/demo/main.cpp
index 4ce61ad9..295847ac 100644
--- a/examples/demo/main.cpp
+++ b/examples/demo/main.cpp
@@ -19,17 +19,17 @@
 
 #include 
 
-#if defined(QT_MODULE_OPENGL)
+#if defined(TQT_MODULE_OPENGL)
 #include "opengl/glworkspace.h"
 #include "opengl/gllandscapeviewer.h"
 #include "opengl/glinfotext.h"
 #endif
 
-#if defined(QT_MODULE_CANVAS)
+#if defined(TQT_MODULE_CANVAS)
 #include "qasteroids/toplevel.h"
 #endif
 
-#if defined(QT_MODULE_TABLE)
+#if defined(TQT_MODULE_TABLE)
 #include "widgets/widgetsbase.h"
 #else
 #include "widgets/widgetsbase_pro.h"
@@ -45,7 +45,7 @@
 #include 
 #include 
 
-#if defined(QT_MODULE_SQL)
+#if defined(TQT_MODULE_SQL)
 #include 
 #include "sql/sqlex.h"
 #endif
@@ -107,7 +107,7 @@ private:
 
 };
 
-#if defined(QT_MODULE_SQL)
+#if defined(TQT_MODULE_SQL)
 class DatabaseCategory : public CategoryInterface
 {
 public:
@@ -145,7 +145,7 @@ private:
 };
 #endif
 
-#if defined(QT_MODULE_CANVAS)
+#if defined(TQT_MODULE_CANVAS)
 class CanvasCategory : public CategoryInterface
 {
 public:
@@ -187,7 +187,7 @@ private:
 };
 #endif
 
-#if defined(QT_MODULE_OPENGL)
+#if defined(TQT_MODULE_OPENGL)
 class OpenGLCategory : public CategoryInterface
 {
 public:
@@ -310,7 +310,7 @@ private:
 
 };
 
-#if defined(QT_MODULE_CANVAS)
+#if defined(TQT_MODULE_CANVAS)
 class GameCategory : public CategoryInterface
 {
 public:
@@ -358,11 +358,11 @@ int main( int argc, char **argv )
 
     TQPtrList categories;
     categories.append( new WidgetCategory( frame.widgetStack() ) );
-#if defined(QT_MODULE_SQL)
+#if defined(TQT_MODULE_SQL)
     categories.append( new DatabaseCategory( frame.widgetStack() ) );
 #endif
     categories.append( new CanvasCategory( frame.widgetStack() ) );
-#if defined(QT_MODULE_OPENGL)
+#if defined(TQT_MODULE_OPENGL)
     categories.append( new OpenGLCategory( frame.widgetStack() ) );
 #endif
     categories.append( new TextCategory( frame.widgetStack() ) );
diff --git a/examples/demo/opengl/glbox.h b/examples/demo/opengl/glbox.h
index 2667cfa3..d702665f 100644
--- a/examples/demo/opengl/glbox.h
+++ b/examples/demo/opengl/glbox.h
@@ -20,7 +20,7 @@
 
 class GLBox : public GLControlWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/examples/demo/opengl/glcontrolwidget.h b/examples/demo/opengl/glcontrolwidget.h
index 97a99f65..7942c31e 100644
--- a/examples/demo/opengl/glcontrolwidget.h
+++ b/examples/demo/opengl/glcontrolwidget.h
@@ -5,7 +5,7 @@
 
 class GLControlWidget : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     GLControlWidget( TQWidget *parent, const char *name = 0, TQGLWidget *share = 0, WFlags f = 0 );
diff --git a/examples/demo/opengl/glgear.h b/examples/demo/opengl/glgear.h
index fed4256c..9e21a753 100644
--- a/examples/demo/opengl/glgear.h
+++ b/examples/demo/opengl/glgear.h
@@ -5,7 +5,7 @@
 
 class GLGear : public GLControlWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     GLGear( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/examples/demo/opengl/gllandscape.h b/examples/demo/opengl/gllandscape.h
index e4f457e7..54a03c01 100644
--- a/examples/demo/opengl/gllandscape.h
+++ b/examples/demo/opengl/gllandscape.h
@@ -5,7 +5,7 @@
 
 class GLLandscape : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     GLLandscape( TQWidget * parent = 0, const char * name = 0 );
diff --git a/examples/demo/opengl/gltexobj.h b/examples/demo/opengl/gltexobj.h
index 5d235dcf..a5e48a32 100644
--- a/examples/demo/opengl/gltexobj.h
+++ b/examples/demo/opengl/gltexobj.h
@@ -20,7 +20,7 @@
 
 class GLTexobj : public GLControlWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     GLTexobj( TQWidget* parent, const char* name = 0, WFlags f = 0 );
diff --git a/examples/demo/opengl/glworkspace.h b/examples/demo/opengl/glworkspace.h
index 3739b24a..6ad1ecb5 100644
--- a/examples/demo/opengl/glworkspace.h
+++ b/examples/demo/opengl/glworkspace.h
@@ -8,7 +8,7 @@ class TQPrinter;
 
 class GLWorkspace : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GLWorkspace( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~GLWorkspace();
diff --git a/examples/demo/qasteroids/ledmeter.h b/examples/demo/qasteroids/ledmeter.h
index 93bae087..720afd6e 100644
--- a/examples/demo/qasteroids/ledmeter.h
+++ b/examples/demo/qasteroids/ledmeter.h
@@ -13,7 +13,7 @@
 
 class KALedMeter : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KALedMeter( TQWidget *parent );
 
diff --git a/examples/demo/qasteroids/toplevel.h b/examples/demo/qasteroids/toplevel.h
index 6b347806..2d9cc5ee 100644
--- a/examples/demo/qasteroids/toplevel.h
+++ b/examples/demo/qasteroids/toplevel.h
@@ -19,7 +19,7 @@ class TQLCDNumber;
 
 class KAstTopLevel : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KAstTopLevel( TQWidget *parent=0, const char *name=0 );
     virtual ~KAstTopLevel();
diff --git a/examples/demo/qasteroids/view.h b/examples/demo/qasteroids/view.h
index 6ab92a1c..35b360ab 100644
--- a/examples/demo/qasteroids/view.h
+++ b/examples/demo/qasteroids/view.h
@@ -18,7 +18,7 @@
 
 class KAsteroidsView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KAsteroidsView( TQWidget *parent = 0, const char *name = 0 );
     virtual ~KAsteroidsView();
diff --git a/examples/demo/qthumbwheel.h b/examples/demo/qthumbwheel.h
index 50ee44ed..45b7afa1 100644
--- a/examples/demo/qthumbwheel.h
+++ b/examples/demo/qthumbwheel.h
@@ -50,7 +50,7 @@
 
 class TQThumbWheel : public TQFrame, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQThumbWheel( TQWidget *parent=0, const char *name=0 );
diff --git a/examples/demo/textdrawing/helpwindow.h b/examples/demo/textdrawing/helpwindow.h
index c9d9a336..af73b475 100644
--- a/examples/demo/textdrawing/helpwindow.h
+++ b/examples/demo/textdrawing/helpwindow.h
@@ -21,7 +21,7 @@ class TQPopupMenu;
 
 class HelpWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HelpWindow( const TQString& home_,  const TQString& path, TQWidget* parent = 0, const char *name=0 );
     ~HelpWindow();
diff --git a/examples/demo/textdrawing/textedit.h b/examples/demo/textdrawing/textedit.h
index 9627c69a..43aea5cd 100644
--- a/examples/demo/textdrawing/textedit.h
+++ b/examples/demo/textdrawing/textedit.h
@@ -20,7 +20,7 @@ class TQTextEdit;
 
 class TextEdit : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TextEdit( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/dirview/dirview.h b/examples/dirview/dirview.h
index 98853450..d0857497 100644
--- a/examples/dirview/dirview.h
+++ b/examples/dirview/dirview.h
@@ -71,7 +71,7 @@ private:
 
 class DirectoryView : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DirectoryView( TQWidget *parent = 0, const char *name = 0, bool sdo = FALSE );
diff --git a/examples/distributor/distributor.ui.h b/examples/distributor/distributor.ui.h
index 1d21f19f..01c6b9bd 100644
--- a/examples/distributor/distributor.ui.h
+++ b/examples/distributor/distributor.ui.h
@@ -121,7 +121,7 @@ static char *find_pattern( char *h, const char *n, ulong hlen )
 
 	if ( nlen > hlen )
 	    return 0;
-    } while ( qstrncmp( h, n, nlen ) != 0 );
+    } while ( tqstrncmp( h, n, nlen ) != 0 );
     return h + nlen;
 }
 
diff --git a/examples/dragdrop/dropsite.h b/examples/dragdrop/dropsite.h
index 26843c1e..7f23f1b3 100644
--- a/examples/dragdrop/dropsite.h
+++ b/examples/dragdrop/dropsite.h
@@ -22,7 +22,7 @@ class TQDragObject;
 
 class DropSite: public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DropSite( TQWidget * parent = 0, const char * name = 0 );
     ~DropSite();
@@ -42,7 +42,7 @@ protected:
 };
 
 class DragMoviePlayer : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQDragObject* dobj;
     TQMovie movie;
 public:
diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp
index 013da846..915e218b 100644
--- a/examples/drawdemo/drawdemo.cpp
+++ b/examples/drawdemo/drawdemo.cpp
@@ -130,7 +130,7 @@ DrawThing ourDrawFunctions[] = {
 
 class DrawView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DrawView();
     ~DrawView();
diff --git a/examples/fileiconview/mainwindow.h b/examples/fileiconview/mainwindow.h
index e9f9a891..38feec78 100644
--- a/examples/fileiconview/mainwindow.h
+++ b/examples/fileiconview/mainwindow.h
@@ -21,7 +21,7 @@ class TQToolButton;
 
 class FileMainWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FileMainWindow();
diff --git a/examples/fileiconview/qfileiconview.h b/examples/fileiconview/qfileiconview.h
index 304456e9..898f26bf 100644
--- a/examples/fileiconview/qfileiconview.h
+++ b/examples/fileiconview/qfileiconview.h
@@ -30,7 +30,7 @@ class TQResizeEvent;
 
 class TQtFileIconDrag : public TQIconDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQtFileIconDrag( TQWidget * dragSource, const char* name = 0 );
@@ -53,7 +53,7 @@ private:
 class TQtFileIconViewItem;
 class TQtFileIconView : public TQIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQtFileIconView( const TQString &dir, TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/fonts/simple-qfont-demo/viewer.h b/examples/fonts/simple-qfont-demo/viewer.h
index 77b71e0c..e69a3f15 100644
--- a/examples/fonts/simple-qfont-demo/viewer.h
+++ b/examples/fonts/simple-qfont-demo/viewer.h
@@ -11,7 +11,7 @@ class TQPushButton;
 
 class Viewer : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:   
     Viewer();
diff --git a/examples/forever/forever.h b/examples/forever/forever.h
index 93ec0b47..0580fa21 100644
--- a/examples/forever/forever.h
+++ b/examples/forever/forever.h
@@ -22,7 +22,7 @@ const int numColors = 120;
 
 class Forever : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Forever( TQWidget *parent=0, const char *name=0 );
 protected:
diff --git a/examples/hello/hello.h b/examples/hello/hello.h
index 50929944..3d17dbf0 100644
--- a/examples/hello/hello.h
+++ b/examples/hello/hello.h
@@ -15,7 +15,7 @@
 
 class Hello : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Hello( const char *text, TQWidget *parent=0, const char *name=0 );
 signals:
diff --git a/examples/helpdemo/helpdemo.h b/examples/helpdemo/helpdemo.h
index cb60371f..c6d40ac4 100644
--- a/examples/helpdemo/helpdemo.h
+++ b/examples/helpdemo/helpdemo.h
@@ -10,7 +10,7 @@ class TQPopupMenu;
 
 class HelpDemo : public HelpDemoBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HelpDemo( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/helpsystem/mainwindow.h b/examples/helpsystem/mainwindow.h
index 00f4da5a..2566bae1 100644
--- a/examples/helpsystem/mainwindow.h
+++ b/examples/helpsystem/mainwindow.h
@@ -15,7 +15,7 @@ class TQAssistantClient;
 
 class MainWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MainWindow();
     ~MainWindow();
diff --git a/examples/helpsystem/whatsthis.h b/examples/helpsystem/whatsthis.h
index 5280567d..85a77fee 100644
--- a/examples/helpsystem/whatsthis.h
+++ b/examples/helpsystem/whatsthis.h
@@ -17,7 +17,7 @@ class TQTable;
 
 class WhatsThis : public TQObject, public TQWhatsThis
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     WhatsThis( TQWidget *w, TQWidget *watch = 0 );
 
diff --git a/examples/helpviewer/helpwindow.h b/examples/helpviewer/helpwindow.h
index fbb4da20..d2203fb8 100644
--- a/examples/helpviewer/helpwindow.h
+++ b/examples/helpviewer/helpwindow.h
@@ -21,7 +21,7 @@ class TQPopupMenu;
 
 class HelpWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HelpWindow( const TQString& home_,  const TQString& path, TQWidget* parent = 0, const char *name=0 );
     ~HelpWindow();
diff --git a/examples/i18n/mywidget.h b/examples/i18n/mywidget.h
index 9cf4690d..7d0b81a7 100644
--- a/examples/i18n/mywidget.h
+++ b/examples/i18n/mywidget.h
@@ -15,7 +15,7 @@
 
 class MyWidget : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MyWidget( TQWidget* parent=0, const char* name = 0 );
diff --git a/examples/iconview/main.cpp b/examples/iconview/main.cpp
index 2738f127..f797dd01 100644
--- a/examples/iconview/main.cpp
+++ b/examples/iconview/main.cpp
@@ -18,7 +18,7 @@
 
 class ListenDND : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListenDND( TQWidget *w )
diff --git a/examples/iconview/simple_dd/main.h b/examples/iconview/simple_dd/main.h
index a752a2d4..57f7e036 100644
--- a/examples/iconview/simple_dd/main.h
+++ b/examples/iconview/simple_dd/main.h
@@ -20,7 +20,7 @@ class TQDragDropEvent;
 
 class DDListBox : public TQListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DDListBox( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
     // Low-level drag and drop
@@ -48,7 +48,7 @@ public:
 
 class DDIconView : public TQIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DDIconView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) :
 	TQIconView( parent, name, f ) {}
diff --git a/examples/life/life.h b/examples/life/life.h
index f7481e25..90fe8657 100644
--- a/examples/life/life.h
+++ b/examples/life/life.h
@@ -15,7 +15,7 @@
 
 class LifeWidget : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LifeWidget( int s = 10, TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/examples/life/lifedlg.h b/examples/life/lifedlg.h
index cb4c8532..38e83526 100644
--- a/examples/life/lifedlg.h
+++ b/examples/life/lifedlg.h
@@ -23,7 +23,7 @@ class TQComboBox;
 
 class LifeTimer : public TQTimer
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LifeTimer( TQWidget *parent );
     enum { MAXSPEED = 1000 };
@@ -39,7 +39,7 @@ private:
 
 class LifeDialog : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LifeDialog( int scale = 10, TQWidget *parent = 0, const char *name = 0 );
 public slots:
diff --git a/examples/lineedits/lineedits.h b/examples/lineedits/lineedits.h
index 96c79b14..d957c064 100644
--- a/examples/lineedits/lineedits.h
+++ b/examples/lineedits/lineedits.h
@@ -17,7 +17,7 @@ class TQComboBox;
 
 class LineEdits : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LineEdits( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/listbox/listbox.h b/examples/listbox/listbox.h
index 06581e0a..b618e941 100644
--- a/examples/listbox/listbox.h
+++ b/examples/listbox/listbox.h
@@ -20,7 +20,7 @@ class TQButtonGroup;
 
 class ListBoxDemo: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ListBoxDemo();
     ~ListBoxDemo();
diff --git a/examples/listboxcombo/listboxcombo.h b/examples/listboxcombo/listboxcombo.h
index 5131fe35..63a40776 100644
--- a/examples/listboxcombo/listboxcombo.h
+++ b/examples/listboxcombo/listboxcombo.h
@@ -17,7 +17,7 @@ class TQLabel;
 
 class ListBoxCombo : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListBoxCombo( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/listviews/listviews.h b/examples/listviews/listviews.h
index 8eb462ac..7ef9b438 100644
--- a/examples/listviews/listviews.h
+++ b/examples/listviews/listviews.h
@@ -79,7 +79,7 @@ protected:
 
 class Folder : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Folder( Folder *parent, const TQString &name );
@@ -138,7 +138,7 @@ protected:
 
 class ListViews : public TQSplitter
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListViews( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/mdi/application.h b/examples/mdi/application.h
index 82bcdb3d..33e87fac 100644
--- a/examples/mdi/application.h
+++ b/examples/mdi/application.h
@@ -22,7 +22,7 @@ class TQMovie;
 
 class MDIWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MDIWindow( TQWidget* parent, const char* name, int wflags );
     ~MDIWindow();
@@ -47,7 +47,7 @@ private:
 
 class ApplicationWindow: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ApplicationWindow();
     ~ApplicationWindow();
diff --git a/examples/menu/menu.cpp b/examples/menu/menu.cpp
index 70eda9b5..12460172 100644
--- a/examples/menu/menu.cpp
+++ b/examples/menu/menu.cpp
@@ -120,7 +120,7 @@ MenuExample::MenuExample( TQWidget *parent, const char *name )
     TQPixmap p2( p2_xpm );
     TQPixmap p3( p3_xpm );
     TQPopupMenu *print = new TQPopupMenu( this );
-    Q_CHECK_PTR( print );
+    TQ_CHECK_PTR( print );
     print->insertTearOffHandle();
     print->insertItem( "&Print to printer", this, SLOT(printer()) );
     print->insertItem( "Print to &file", this, SLOT(file()) );
@@ -129,7 +129,7 @@ MenuExample::MenuExample( TQWidget *parent, const char *name )
     print->insertItem( "Printer &Setup", this, SLOT(printerSetup()) );
 
     TQPopupMenu *file = new TQPopupMenu( this );
-    Q_CHECK_PTR( file );
+    TQ_CHECK_PTR( file );
     file->insertItem( p1, "&Open",  this, SLOT(open()), CTRL+Key_O );
     file->insertItem( p2, "&New", this, SLOT(news()), CTRL+Key_N );
     file->insertItem( p3, "&Save", this, SLOT(save()), CTRL+Key_S );
@@ -140,14 +140,14 @@ MenuExample::MenuExample( TQWidget *parent, const char *name )
     file->insertItem( "E&xit",  qApp, SLOT(quit()), CTRL+Key_Q );
 
     TQPopupMenu *edit = new TQPopupMenu( this );
-    Q_CHECK_PTR( edit );
+    TQ_CHECK_PTR( edit );
     int undoID = edit->insertItem( "&Undo", this, SLOT(undo()) );
     int redoID = edit->insertItem( "&Redo", this, SLOT(redo()) );
     edit->setItemEnabled( undoID, FALSE );
     edit->setItemEnabled( redoID, FALSE );
 
     TQPopupMenu* options = new TQPopupMenu( this );
-    Q_CHECK_PTR( options );
+    TQ_CHECK_PTR( options );
     options->insertTearOffHandle();
     options->setCaption("Options");
     options->insertItem( "&Normal Font", this, SLOT(normal()) );
@@ -171,13 +171,13 @@ MenuExample::MenuExample( TQWidget *parent, const char *name )
 
 
     TQPopupMenu *help = new TQPopupMenu( this );
-    Q_CHECK_PTR( help );
+    TQ_CHECK_PTR( help );
     help->insertItem( "&About", this, SLOT(about()), CTRL+Key_H );
     help->insertItem( "About &TQt", this, SLOT(aboutTQt()) );
 
     // If we used a TQMainWindow we could use its built-in menuBar().
     menu = new TQMenuBar( this );
-    Q_CHECK_PTR( menu );
+    TQ_CHECK_PTR( menu );
     menu->insertItem( "&File", file );
     menu->insertItem( "&Edit", edit );
     menu->insertItem( "&Options", options );
@@ -187,7 +187,7 @@ MenuExample::MenuExample( TQWidget *parent, const char *name )
 
 
     TQLabel *msg = new TQLabel( this );
-    Q_CHECK_PTR( msg );
+    TQ_CHECK_PTR( msg );
     msg->setText( "A context menu is available.\n"
 		  "Invoke it by right-clicking or by"
 		  " pressing the 'context' button." );
@@ -195,7 +195,7 @@ MenuExample::MenuExample( TQWidget *parent, const char *name )
     msg->setAlignment( AlignCenter );
 
     label = new TQLabel( this );
-    Q_CHECK_PTR( label );
+    TQ_CHECK_PTR( label );
     label->setGeometry( 20, rect().center().y()-20, width()-40, 40 );
     label->setFrameStyle( TQFrame::Box | TQFrame::Raised );
     label->setLineWidth( 1 );
@@ -212,7 +212,7 @@ MenuExample::MenuExample( TQWidget *parent, const char *name )
 void MenuExample::contextMenuEvent( TQContextMenuEvent * )
 {
     TQPopupMenu*	contextMenu = new TQPopupMenu( this );
-    Q_CHECK_PTR( contextMenu );
+    TQ_CHECK_PTR( contextMenu );
     TQLabel *caption = new TQLabel( ""
 	"Context Menu", this );
     caption->setAlignment( TQt::AlignCenter );
@@ -221,7 +221,7 @@ void MenuExample::contextMenuEvent( TQContextMenuEvent * )
     contextMenu->insertItem( "&Open...", this, SLOT(open()), CTRL+Key_O );
     contextMenu->insertItem( "&Save", this, SLOT(save()), CTRL+Key_S );
     TQPopupMenu *submenu = new TQPopupMenu( this );
-    Q_CHECK_PTR( submenu );
+    TQ_CHECK_PTR( submenu );
     submenu->insertItem( "&Print to printer", this, SLOT(printer()) );
     submenu->insertItem( "Print to &file", this, SLOT(file()) );
     submenu->insertItem( "Print to fa&x", this, SLOT(fax()) );
diff --git a/examples/menu/menu.h b/examples/menu/menu.h
index 0f3eb396..20fdf0a4 100644
--- a/examples/menu/menu.h
+++ b/examples/menu/menu.h
@@ -17,7 +17,7 @@
 
 class MenuExample : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MenuExample( TQWidget *parent=0, const char *name=0 );
 
diff --git a/examples/movies/main.cpp b/examples/movies/main.cpp
index cabfc555..93fbeb43 100644
--- a/examples/movies/main.cpp
+++ b/examples/movies/main.cpp
@@ -18,7 +18,7 @@
 
 
 class MovieScreen : public TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
     TQMovie movie;
     TQString filename;
     TQSize sh;
@@ -218,7 +218,7 @@ public:
 // A TQFileDialog that chooses movies.
 //
 class MovieStarter: public TQFileDialog {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MovieStarter(const char *dir);
 
diff --git a/examples/network/clientserver/client/client.cpp b/examples/network/clientserver/client/client.cpp
index 6a1a8eb0..26daf93b 100644
--- a/examples/network/clientserver/client/client.cpp
+++ b/examples/network/clientserver/client/client.cpp
@@ -20,7 +20,7 @@
 
 class Client : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Client( const TQString &host, Q_UINT16 port )
     {
diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp
index cde5cc7c..c7644b10 100644
--- a/examples/network/clientserver/server/server.cpp
+++ b/examples/network/clientserver/server/server.cpp
@@ -26,7 +26,7 @@
 */
 class ClientSocket : public TQSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ClientSocket( int sock, TQObject *parent=0, const char *name=0 ) :
 	TQSocket( parent, name )
@@ -73,7 +73,7 @@ private:
 */
 class SimpleServer : public TQServerSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SimpleServer( TQObject* parent=0 ) :
 	TQServerSocket( 4242, 1, parent )
@@ -105,7 +105,7 @@ signals:
 */
 class ServerInfo : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ServerInfo()
     {
diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp
index 6f7146b1..3c8b94b3 100644
--- a/examples/network/httpd/httpd.cpp
+++ b/examples/network/httpd/httpd.cpp
@@ -21,7 +21,7 @@
 // HttpDaemon is the the class that implements the simple HTTP server.
 class HttpDaemon : public TQServerSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HttpDaemon( TQObject* parent=0 ) :
 	TQServerSocket(8080,1,parent)
@@ -84,7 +84,7 @@ private slots:
 // the actions of the server.
 class HttpInfo : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HttpInfo()
     {
diff --git a/examples/network/infoprotocol/infoclient/client.h b/examples/network/infoprotocol/infoclient/client.h
index 50a31bda..e2590686 100644
--- a/examples/network/infoprotocol/infoclient/client.h
+++ b/examples/network/infoprotocol/infoclient/client.h
@@ -22,7 +22,7 @@ static const Q_UINT16 infoPort = 42417;
 
 class ClientInfo : public ClientInfoBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ClientInfo( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/examples/network/infoprotocol/infoserver/server.h b/examples/network/infoprotocol/infoserver/server.h
index 87683b89..33fb6782 100644
--- a/examples/network/infoprotocol/infoserver/server.h
+++ b/examples/network/infoprotocol/infoserver/server.h
@@ -25,7 +25,7 @@ static const Q_UINT16 infoPort = 42417;
 */
 class ServerInfo : public ServerInfoBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ServerInfo( Q_UINT16 port = infoPort, TQWidget *parent = 0, const char *name = 0 );
 
@@ -36,7 +36,7 @@ private slots:
 
 class SimpleServer : public TQServerSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SimpleServer( Q_UINT16 port = infoPort, TQObject* parent = 0, const char *name = 0 );
     void newConnection( int socket );
@@ -51,7 +51,7 @@ private:
 
 class ClientSocket : public TQSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ClientSocket( int sock, InfoData *i, TQObject *parent = 0, const char *name = 0 );
 
diff --git a/examples/network/infoprotocol/infourlclient/client.h b/examples/network/infoprotocol/infourlclient/client.h
index 42e1e303..43641efb 100644
--- a/examples/network/infoprotocol/infourlclient/client.h
+++ b/examples/network/infoprotocol/infourlclient/client.h
@@ -17,7 +17,7 @@
 
 class ClientInfo : public ClientInfoBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ClientInfo( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/network/infoprotocol/infourlclient/qip.h b/examples/network/infoprotocol/infourlclient/qip.h
index cb748a3b..ee70383d 100644
--- a/examples/network/infoprotocol/infourlclient/qip.h
+++ b/examples/network/infoprotocol/infourlclient/qip.h
@@ -19,7 +19,7 @@ static const Q_UINT16 infoPort = 42417;
 
 class Qip : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Qip();
diff --git a/examples/network/mail/composer.h b/examples/network/mail/composer.h
index dcf46fc5..0a29dcf7 100644
--- a/examples/network/mail/composer.h
+++ b/examples/network/mail/composer.h
@@ -21,7 +21,7 @@ class TQPushButton;
 
 class Composer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Composer( TQWidget *parent = 0 );
diff --git a/examples/network/mail/smtp.h b/examples/network/mail/smtp.h
index f8c787e1..deb84890 100644
--- a/examples/network/mail/smtp.h
+++ b/examples/network/mail/smtp.h
@@ -19,7 +19,7 @@ class TQDns;
 
 class Smtp : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Smtp( const TQString &from, const TQString &to,
diff --git a/examples/network/networkprotocol/nntp.h b/examples/network/networkprotocol/nntp.h
index 0e9fa280..c09a3ea4 100644
--- a/examples/network/networkprotocol/nntp.h
+++ b/examples/network/networkprotocol/nntp.h
@@ -15,7 +15,7 @@
 
 class Nntp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Nntp();
diff --git a/examples/network/networkprotocol/view.h b/examples/network/networkprotocol/view.h
index d76a7f4f..b69138e2 100644
--- a/examples/network/networkprotocol/view.h
+++ b/examples/network/networkprotocol/view.h
@@ -18,7 +18,7 @@ class TQMultiLineEdit;
 
 class View : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     View();
diff --git a/examples/network/remotecontrol/ipcserver.cpp b/examples/network/remotecontrol/ipcserver.cpp
index 6a1d10cd..f7f52ab4 100644
--- a/examples/network/remotecontrol/ipcserver.cpp
+++ b/examples/network/remotecontrol/ipcserver.cpp
@@ -8,7 +8,7 @@
 
 class IpcSocket : public TQSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     IpcSocket( TQObject *parent) : TQSocket( parent )
diff --git a/examples/network/remotecontrol/ipcserver.h b/examples/network/remotecontrol/ipcserver.h
index d9188f1e..b2b17f61 100644
--- a/examples/network/remotecontrol/ipcserver.h
+++ b/examples/network/remotecontrol/ipcserver.h
@@ -5,7 +5,7 @@
 
 class IpcServer : public TQServerSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     IpcServer( Q_UINT16 port, TQObject *parent );
diff --git a/examples/network/remotecontrol/remotectrlimpl.h b/examples/network/remotecontrol/remotectrlimpl.h
index a14d1be7..a48d5431 100644
--- a/examples/network/remotecontrol/remotectrlimpl.h
+++ b/examples/network/remotecontrol/remotectrlimpl.h
@@ -7,7 +7,7 @@ class TQSocket;
 
 class RemoteCtrlImpl : public RemoteCtrl
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RemoteCtrlImpl( TQSocket * );
diff --git a/examples/network/remotecontrol/startup.h b/examples/network/remotecontrol/startup.h
index 10922d26..a3359f57 100644
--- a/examples/network/remotecontrol/startup.h
+++ b/examples/network/remotecontrol/startup.h
@@ -9,7 +9,7 @@ class MainDialog;
 
 class StartUp : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     StartUp();
diff --git a/examples/opengl/box/glbox.h b/examples/opengl/box/glbox.h
index 93b4d757..9d8bebc9 100644
--- a/examples/opengl/box/glbox.h
+++ b/examples/opengl/box/glbox.h
@@ -21,7 +21,7 @@
 
 class GLBox : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/examples/opengl/box/globjwin.h b/examples/opengl/box/globjwin.h
index e6a279f0..d2385d9c 100644
--- a/examples/opengl/box/globjwin.h
+++ b/examples/opengl/box/globjwin.h
@@ -22,7 +22,7 @@
 
 class GLObjectWindow : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GLObjectWindow( TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/examples/opengl/glpixmap/glbox.h b/examples/opengl/glpixmap/glbox.h
index a7ec8fc2..9903c23d 100644
--- a/examples/opengl/glpixmap/glbox.h
+++ b/examples/opengl/glpixmap/glbox.h
@@ -21,7 +21,7 @@
 
 class GLBox : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/examples/opengl/glpixmap/globjwin.h b/examples/opengl/glpixmap/globjwin.h
index 7f8952f7..574b6b5f 100644
--- a/examples/opengl/glpixmap/globjwin.h
+++ b/examples/opengl/glpixmap/globjwin.h
@@ -25,7 +25,7 @@ class TQPopupMenu;
 
 class GLObjectWindow : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GLObjectWindow( TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/examples/opengl/overlay/globjwin.h b/examples/opengl/overlay/globjwin.h
index ffcd72bb..82fe14ec 100644
--- a/examples/opengl/overlay/globjwin.h
+++ b/examples/opengl/overlay/globjwin.h
@@ -22,7 +22,7 @@
 
 class GLObjectWindow : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GLObjectWindow( TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/examples/opengl/overlay/glteapots.h b/examples/opengl/overlay/glteapots.h
index 57595397..24f27367 100644
--- a/examples/opengl/overlay/glteapots.h
+++ b/examples/opengl/overlay/glteapots.h
@@ -22,7 +22,7 @@
 
 class GLTeapots : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/examples/opengl/overlay_x11/main.cpp b/examples/opengl/overlay_x11/main.cpp
index 5925d271..c96e3d9b 100644
--- a/examples/opengl/overlay_x11/main.cpp
+++ b/examples/opengl/overlay_x11/main.cpp
@@ -28,7 +28,7 @@ TQColor findOverlayTransparentColor()
     Visual* appVisual;
 
     // The static methods are called 'App' in TQt 2.x
-#if QT_VERSION < 200
+#if TQT_VERSION < 200
     appDisplay = TQPaintDevice::x__Display();
     appVisual = (Visual*)TQPaintDevice::x11Visual();
 #else
diff --git a/examples/opengl/sharedbox/glbox.h b/examples/opengl/sharedbox/glbox.h
index 548457ce..f7565979 100644
--- a/examples/opengl/sharedbox/glbox.h
+++ b/examples/opengl/sharedbox/glbox.h
@@ -21,7 +21,7 @@
 
 class GLBox : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/examples/opengl/sharedbox/globjwin.h b/examples/opengl/sharedbox/globjwin.h
index 5832ee68..f09d2440 100644
--- a/examples/opengl/sharedbox/globjwin.h
+++ b/examples/opengl/sharedbox/globjwin.h
@@ -22,7 +22,7 @@ class GLBox;
 
 class GLObjectWindow : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GLObjectWindow( TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/examples/opengl/texture/globjwin.h b/examples/opengl/texture/globjwin.h
index e6a279f0..d2385d9c 100644
--- a/examples/opengl/texture/globjwin.h
+++ b/examples/opengl/texture/globjwin.h
@@ -22,7 +22,7 @@
 
 class GLObjectWindow : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GLObjectWindow( TQWidget* parent = 0, const char* name = 0 );
 
diff --git a/examples/opengl/texture/gltexobj.h b/examples/opengl/texture/gltexobj.h
index 8d167228..0f86b268 100644
--- a/examples/opengl/texture/gltexobj.h
+++ b/examples/opengl/texture/gltexobj.h
@@ -21,7 +21,7 @@
 
 class GLTexobj : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/examples/popup/popup.h b/examples/popup/popup.h
index 10e4b669..d8a28236 100644
--- a/examples/popup/popup.h
+++ b/examples/popup/popup.h
@@ -19,7 +19,7 @@
 
 class FancyPopup : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FancyPopup( TQWidget* parent = 0, const char*  name=0);
     
@@ -37,7 +37,7 @@ private:
 
  class Frame : public TQFrame
  {
-     Q_OBJECT
+     TQ_OBJECT
  public:
      Frame( TQWidget *parent=0, const char*  name=0);
 
diff --git a/examples/process/process.cpp b/examples/process/process.cpp
index 945017fe..0ff879ac 100644
--- a/examples/process/process.cpp
+++ b/examples/process/process.cpp
@@ -19,7 +19,7 @@
 
 class UicManager : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     UicManager();
diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp
index 917366cb..54887170 100644
--- a/examples/progress/progress.cpp
+++ b/examples/progress/progress.cpp
@@ -119,7 +119,7 @@ private:
 
 class CPUWaster : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     enum { first_draw_item = 1000, last_draw_item = 1006 };
 
@@ -142,10 +142,10 @@ public:
 	pb(0)
     {
 	menubar = new TQMenuBar( this, "menu" );
-	Q_CHECK_PTR( menubar );
+	TQ_CHECK_PTR( menubar );
 
 	TQPopupMenu* file = new TQPopupMenu();
-	Q_CHECK_PTR( file );
+	TQ_CHECK_PTR( file );
 	menubar->insertItem( "&File", file );
 	for (int i=first_draw_item; i<=last_draw_item; i++)
 	    file->insertItem( drawItemText(i), i );
@@ -154,7 +154,7 @@ public:
 	file->insertItem( "Quit", qApp,  SLOT(quit()) );
 
 	options = new TQPopupMenu();
-	Q_CHECK_PTR( options );
+	TQ_CHECK_PTR( options );
 	menubar->insertItem( "&Options", options );
 	td_id = options->insertItem( "Timer driven", this, SLOT(timerDriven()) );
 	ld_id = options->insertItem( "Loop driven", this, SLOT(loopDriven()) );
diff --git a/examples/progressbar/progressbar.h b/examples/progressbar/progressbar.h
index f8477778..8ec07357 100644
--- a/examples/progressbar/progressbar.h
+++ b/examples/progressbar/progressbar.h
@@ -19,7 +19,7 @@ class TQProgressBar;
 
 class ProgressBar : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ProgressBar( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/qdir/ntqdir.h b/examples/qdir/ntqdir.h
index 9b591345..82c91d3c 100644
--- a/examples/qdir/ntqdir.h
+++ b/examples/qdir/ntqdir.h
@@ -27,7 +27,7 @@ class TQPopupMenu;
 
 class PixmapView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PixmapView( TQWidget *parent );
@@ -41,7 +41,7 @@ private:
 
 class Preview : public TQWidgetStack
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Preview( TQWidget *parent );
@@ -57,7 +57,7 @@ private:
 class PreviewWidget : public TQVBox,
 		      public TQFilePreview
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PreviewWidget( TQWidget *parent );
@@ -71,7 +71,7 @@ private:
 
 class CustomFileDialog : public TQFileDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CustomFileDialog();
diff --git a/examples/qfd/fontdisplayer.h b/examples/qfd/fontdisplayer.h
index 3ae0a9d6..612e5f22 100644
--- a/examples/qfd/fontdisplayer.h
+++ b/examples/qfd/fontdisplayer.h
@@ -16,7 +16,7 @@
 class TQSlider;
 
 class FontRowTable : public TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FontRowTable( TQWidget* parent=0, const char* name=0 );
 
@@ -39,7 +39,7 @@ private:
 };
 
 class FontDisplayer : public TQMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     FontDisplayer( TQWidget* parent=0, const char* name=0 );
 };
diff --git a/examples/qmag/qmag.cpp b/examples/qmag/qmag.cpp
index b87820ae..34504300 100644
--- a/examples/qmag/qmag.cpp
+++ b/examples/qmag/qmag.cpp
@@ -22,7 +22,7 @@
 
 class MagWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MagWidget( TQWidget *parent=0, const char *name=0 );
 
@@ -88,12 +88,12 @@ MagWidget::MagWidget( TQWidget *parent, const char *name )
     int w=0, x=0, n;
 
     zoom = new TQComboBox( FALSE, this );
-    Q_CHECK_PTR(zoom);
+    TQ_CHECK_PTR(zoom);
     zoom->insertStrList( zoomfactors, 9 );
     connect( zoom, SIGNAL(activated(int)), SLOT(setZoom(int)) );
 
     refresh = new TQComboBox( FALSE, this );
-    Q_CHECK_PTR(refresh);
+    TQ_CHECK_PTR(refresh);
     refresh->insertStrList( refreshrates, 9 );
     connect( refresh, SIGNAL(activated(int)), SLOT(setRefresh(int)) );
 
@@ -112,7 +112,7 @@ MagWidget::MagWidget( TQWidget *parent, const char *name )
     refresh->setGeometry( x, 2, w+30, 20 );
 
     saveButton = new TQPushButton( this );
-    Q_CHECK_PTR(saveButton);
+    TQ_CHECK_PTR(saveButton);
     connect( saveButton, SIGNAL(clicked()), this, SLOT(save()) );
     saveButton->setText( "Save" );
     saveButton->setGeometry( x+w+30+2, 2,
@@ -120,14 +120,14 @@ MagWidget::MagWidget( TQWidget *parent, const char *name )
 
     multiSaveButton = new TQPushButton( this );
     multiSaveButton->setToggleButton(TRUE);
-    Q_CHECK_PTR(multiSaveButton);
+    TQ_CHECK_PTR(multiSaveButton);
     connect( multiSaveButton, SIGNAL(clicked()), this, SLOT(multiSave()) );
     multiSaveButton->setText( "MultiSave" );
     multiSaveButton->setGeometry( saveButton->geometry().right() + 2, 2,
 			     10+multiSaveButton->fontMetrics().width("MultiSave"), 20 );
 
     quitButton = new TQPushButton( this );
-    Q_CHECK_PTR(quitButton);
+    TQ_CHECK_PTR(quitButton);
     connect( quitButton, SIGNAL(clicked()), qApp, SLOT(quit()) );
     quitButton->setText( "Quit" );
     quitButton->setGeometry( multiSaveButton->geometry().right() + 2, 2,
@@ -141,7 +141,7 @@ MagWidget::MagWidget( TQWidget *parent, const char *name )
     setZoom(5);
 
     rgb = new TQLabel( this );
-    Q_CHECK_PTR( rgb );
+    TQ_CHECK_PTR( rgb );
     rgb->setText( "" );
     rgb->setAlignment( AlignVCenter );
     rgb->resize( width(), rgb->fontMetrics().height() + 4 );
diff --git a/examples/qwerty/qwerty.cpp b/examples/qwerty/qwerty.cpp
index 93dcc2eb..4d791127 100644
--- a/examples/qwerty/qwerty.cpp
+++ b/examples/qwerty/qwerty.cpp
@@ -34,7 +34,7 @@ Editor::Editor( TQWidget * parent , const char * name )
     m = new TQMenuBar( this, "menu" );
 
     TQPopupMenu * file = new TQPopupMenu();
-    Q_CHECK_PTR( file );
+    TQ_CHECK_PTR( file );
     m->insertItem( "&File", file );
 
     file->insertItem( "&New",   this, SLOT(newDoc()),   ALT+Key_N );
@@ -59,7 +59,7 @@ Editor::Editor( TQWidget * parent , const char * name )
     rebuildCodecList();
 
     TQPopupMenu * edit = new TQPopupMenu();
-    Q_CHECK_PTR( edit );
+    TQ_CHECK_PTR( edit );
     m->insertItem( "&Edit", edit );
 
     edit->insertItem( "To &Uppercase",   this, SLOT(toUpper()),   ALT+Key_U );
diff --git a/examples/qwerty/qwerty.h b/examples/qwerty/qwerty.h
index a20b965c..efd2202f 100644
--- a/examples/qwerty/qwerty.h
+++ b/examples/qwerty/qwerty.h
@@ -17,7 +17,7 @@
 
 class Editor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Editor( TQWidget *parent=0, const char *name="qwerty" );
    ~Editor();
diff --git a/examples/rangecontrols/rangecontrols.h b/examples/rangecontrols/rangecontrols.h
index 59d4b9ff..2542111d 100644
--- a/examples/rangecontrols/rangecontrols.h
+++ b/examples/rangecontrols/rangecontrols.h
@@ -16,7 +16,7 @@ class TQCheckBox;
 
 class RangeControls : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RangeControls( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/regexptester/regexptester.h b/examples/regexptester/regexptester.h
index 8eb6a7e5..d3256f55 100644
--- a/examples/regexptester/regexptester.h
+++ b/examples/regexptester/regexptester.h
@@ -12,7 +12,7 @@ class TQTable;
 
 class RegexpTester : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     RegexpTester(TQWidget* parent=0, const char* name=0, bool modal=false,
diff --git a/examples/richtext/richtext.h b/examples/richtext/richtext.h
index dde6771a..77913f76 100644
--- a/examples/richtext/richtext.h
+++ b/examples/richtext/richtext.h
@@ -17,7 +17,7 @@ class TQPushButton;
 
 class MyRichText : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MyRichText( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/rot13/rot13.h b/examples/rot13/rot13.h
index 7e9d2850..3933e6fe 100644
--- a/examples/rot13/rot13.h
+++ b/examples/rot13/rot13.h
@@ -19,7 +19,7 @@
 class TQMultiLineEdit;
 
 class Rot13: public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Rot13();
 
diff --git a/examples/scribble/scribble.h b/examples/scribble/scribble.h
index 72e58b24..e19a49a4 100644
--- a/examples/scribble/scribble.h
+++ b/examples/scribble/scribble.h
@@ -26,7 +26,7 @@ class TQSpinBox;
 
 class Canvas : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Canvas( TQWidget *parent = 0, const char *name = 0 );
@@ -65,7 +65,7 @@ protected:
 
 class Scribble : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Scribble( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp
index e3711164..e7db2d2f 100644
--- a/examples/scrollview/scrollview.cpp
+++ b/examples/scrollview/scrollview.cpp
@@ -32,7 +32,7 @@ static const int max_mw		= 10;
 
 
 class BigShrinker : public TQFrame {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BigShrinker(TQWidget* parent) :
 	TQFrame(parent)
@@ -195,22 +195,22 @@ private:
 };
 
 class ScrollViewExample : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ScrollViewExample(int technique, TQWidget* parent=0, const char* name=0) :
 	TQWidget(parent,name)
     {
 	TQMenuBar* menubar = new TQMenuBar(this);
-	Q_CHECK_PTR( menubar );
+	TQ_CHECK_PTR( menubar );
 
 	TQPopupMenu* file = new TQPopupMenu( menubar );
-	Q_CHECK_PTR( file );
+	TQ_CHECK_PTR( file );
 	menubar->insertItem( "&File", file );
 	file->insertItem( "Quit", qApp,  SLOT(quit()) );
 
 	vp_options = new TQPopupMenu( menubar );
-	Q_CHECK_PTR( vp_options );
+	TQ_CHECK_PTR( vp_options );
 	vp_options->setCheckable( TRUE );
 	menubar->insertItem( "&ScrollView", vp_options );
 	connect( vp_options, SIGNAL(activated(int)),
@@ -248,7 +248,7 @@ public:
 	}
 
 	f_options = new TQPopupMenu( menubar );
-	Q_CHECK_PTR( f_options );
+	TQ_CHECK_PTR( f_options );
 	f_options->setCheckable( TRUE );
 	menubar->insertItem( "F&rame", f_options );
 	connect( f_options, SIGNAL(activated(int)),
@@ -265,7 +265,7 @@ public:
 	    f_options->insertItem( "Sunken", style_id|TQFrame::Sunken ));
 	f_options->insertSeparator();
 	lw_options = new TQPopupMenu( menubar );
-	Q_CHECK_PTR( lw_options );
+	TQ_CHECK_PTR( lw_options );
 	lw_options->setCheckable( TRUE );
 	for (int lw = 1; lw <= max_lw; lw++) {
 	    TQString str;
@@ -276,7 +276,7 @@ public:
 	connect( lw_options, SIGNAL(activated(int)),
 	    this, SLOT(doFMenuItem(int)) );
 	mlw_options = new TQPopupMenu( menubar );
-	Q_CHECK_PTR( mlw_options );
+	TQ_CHECK_PTR( mlw_options );
 	mlw_options->setCheckable( TRUE );
 	for (int mlw = 0; mlw <= max_mlw; mlw++) {
 	    TQString str;
@@ -287,7 +287,7 @@ public:
 	connect( mlw_options, SIGNAL(activated(int)),
 	    this, SLOT(doFMenuItem(int)) );
 	mw_options = new TQPopupMenu( menubar );
-	Q_CHECK_PTR( mw_options );
+	TQ_CHECK_PTR( mw_options );
 	mw_options->setCheckable( TRUE );
 	for (int mw = 0; mw <= max_mw; mw++) {
 	    TQString str;
diff --git a/examples/showimg/imagefip.h b/examples/showimg/imagefip.h
index e6ef0fb9..09e22de2 100644
--- a/examples/showimg/imagefip.h
+++ b/examples/showimg/imagefip.h
@@ -16,7 +16,7 @@
 
 class ImageIconProvider : public TQFileIconProvider
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQStrList fmts;
     TQPixmap imagepm;
 
diff --git a/examples/showimg/imagetexteditor.h b/examples/showimg/imagetexteditor.h
index 6af9e6eb..21664d27 100644
--- a/examples/showimg/imagetexteditor.h
+++ b/examples/showimg/imagetexteditor.h
@@ -20,7 +20,7 @@ class TQMultiLineEdit;
 
 class ImageTextEditor : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ImageTextEditor( TQImage& i, TQWidget *parent=0, const char *name=0, WFlags f=0 );
     ~ImageTextEditor();
diff --git a/examples/showimg/showimg.h b/examples/showimg/showimg.h
index 362b1c2d..f51fa607 100644
--- a/examples/showimg/showimg.h
+++ b/examples/showimg/showimg.h
@@ -20,7 +20,7 @@ class TQPopupMenu;
 
 class ImageViewer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ImageViewer( TQWidget *parent=0, const char *name=0, int wFlags=0 );
     ~ImageViewer();
diff --git a/examples/sound/sound.h b/examples/sound/sound.h
index 573e8713..ee4bc585 100644
--- a/examples/sound/sound.h
+++ b/examples/sound/sound.h
@@ -13,7 +13,7 @@
 #include 
 
 class SoundPlayer : public TQMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SoundPlayer();
 
diff --git a/examples/sql/overview/custom1/main.h b/examples/sql/overview/custom1/main.h
index 3ffd1c1c..7ee9d5dd 100644
--- a/examples/sql/overview/custom1/main.h
+++ b/examples/sql/overview/custom1/main.h
@@ -21,7 +21,7 @@
 
 class CustomEdit : public TQLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine )
     public:
 	CustomEdit( TQWidget *parent=0, const char *name=0 );
@@ -36,7 +36,7 @@ class CustomEdit : public TQLineEdit
 
 class FormDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	FormDialog();
 	~FormDialog();
diff --git a/examples/sql/overview/form2/main.h b/examples/sql/overview/form2/main.h
index ddd91039..c3d251e6 100644
--- a/examples/sql/overview/form2/main.h
+++ b/examples/sql/overview/form2/main.h
@@ -20,7 +20,7 @@
 
 class FormDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	FormDialog();
 	~FormDialog();
diff --git a/examples/sql/overview/table3/main.h b/examples/sql/overview/table3/main.h
index e93e6ee7..8720dbb6 100644
--- a/examples/sql/overview/table3/main.h
+++ b/examples/sql/overview/table3/main.h
@@ -18,7 +18,7 @@
 
 class StatusPicker : public TQComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
     public:
 	StatusPicker( TQWidget *parent=0, const char *name=0 );
@@ -31,7 +31,7 @@ class StatusPicker : public TQComboBox
 
 class CustomSqlEditorFactory : public TQSqlEditorFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	TQWidget *createEditor( TQWidget *parent, const TQSqlField *field );
 };
diff --git a/examples/sql/overview/table4/main.h b/examples/sql/overview/table4/main.h
index ecd878b1..184d6977 100644
--- a/examples/sql/overview/table4/main.h
+++ b/examples/sql/overview/table4/main.h
@@ -20,7 +20,7 @@
 
 class StatusPicker : public TQComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int statusid READ statusId WRITE setStatusId )
 public:
     StatusPicker( TQWidget *parent=0, const char *name=0 );
@@ -33,7 +33,7 @@ private:
 
 class CustomTable : public TQDataTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CustomTable( 
 	    TQSqlCursor *cursor, bool autoPopulate = FALSE, 
@@ -47,7 +47,7 @@ public:
 
 class CustomSqlEditorFactory : public TQSqlEditorFactory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidget *createEditor( TQWidget *parent, const TQSqlField *field );
 };
diff --git a/examples/tabdialog/tabdialog.h b/examples/tabdialog/tabdialog.h
index 0d2634cc..a501ae8b 100644
--- a/examples/tabdialog/tabdialog.h
+++ b/examples/tabdialog/tabdialog.h
@@ -16,7 +16,7 @@
 
 class TabDialog : public TQTabDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TabDialog( TQWidget *parent, const char *name, const TQString &_filename );
diff --git a/examples/table/statistics/statistics.h b/examples/table/statistics/statistics.h
index a5225d99..abc15cf8 100644
--- a/examples/table/statistics/statistics.h
+++ b/examples/table/statistics/statistics.h
@@ -35,7 +35,7 @@ private:
 
 class Table : public TQTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Table();
diff --git a/examples/tablet/canvas.h b/examples/tablet/canvas.h
index bc76dad7..bc0267d0 100644
--- a/examples/tablet/canvas.h
+++ b/examples/tablet/canvas.h
@@ -20,7 +20,7 @@
 
 class Canvas : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Canvas( TQWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
diff --git a/examples/tablet/scribble.h b/examples/tablet/scribble.h
index 36eaa7ed..9f505d75 100644
--- a/examples/tablet/scribble.h
+++ b/examples/tablet/scribble.h
@@ -27,7 +27,7 @@ class Canvas;
 
 class Scribble : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Scribble( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/tablet/tabletstats.h b/examples/tablet/tabletstats.h
index 473866e9..8e1e2c9f 100644
--- a/examples/tablet/tabletstats.h
+++ b/examples/tablet/tabletstats.h
@@ -19,7 +19,7 @@ class TQLabel;
 
 class MyOrientation : public TQFrame  
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MyOrientation( TQWidget *parent = 0, const char *name = 0 );
     virtual ~MyOrientation();
@@ -31,7 +31,7 @@ public slots:
 
 class StatsCanvas : public Canvas
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     StatsCanvas( TQWidget *parent = 0, const char* name = 0 );
     ~StatsCanvas();
@@ -54,7 +54,7 @@ private:
 
 class TabletStats : public TabletStatsBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TabletStats( TQWidget *parent, const char* name );
     ~TabletStats();
diff --git a/examples/tetrix/qdragapp.cpp b/examples/tetrix/qdragapp.cpp
index d9903e79..41fd5eb3 100644
--- a/examples/tetrix/qdragapp.cpp
+++ b/examples/tetrix/qdragapp.cpp
@@ -25,7 +25,7 @@ class TQDragger;
 
 class DropWindow : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     void paintEvent( TQPaintEvent * );
     void closeEvent( TQCloseEvent * );
@@ -50,7 +50,7 @@ struct DraggedInfo {
 
 class TQDragger : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDragger();
     ~TQDragger();
diff --git a/examples/tetrix/qdragapp.h b/examples/tetrix/qdragapp.h
index 85f3b9dd..c710bd97 100644
--- a/examples/tetrix/qdragapp.h
+++ b/examples/tetrix/qdragapp.h
@@ -16,7 +16,7 @@ class TQDragger;
 
 class TQDragApplication : public TQApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDragApplication( int &argc, char **argv );
     virtual ~TQDragApplication();
diff --git a/examples/tetrix/qtetrix.h b/examples/tetrix/qtetrix.h
index 1c81fcdf..3fc9f429 100644
--- a/examples/tetrix/qtetrix.h
+++ b/examples/tetrix/qtetrix.h
@@ -20,7 +20,7 @@
 
 class ShowNextPiece : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQTetrix;
 public:
     ShowNextPiece( TQWidget *parent=0, const char *name=0  );
@@ -39,7 +39,7 @@ private:
 
 class TQTetrix : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTetrix( TQWidget *parent=0, const char *name=0 );
     void startGame() { board->startGame(); }
diff --git a/examples/tetrix/qtetrixb.h b/examples/tetrix/qtetrixb.h
index 0e9812e8..6c2bd228 100644
--- a/examples/tetrix/qtetrixb.h
+++ b/examples/tetrix/qtetrixb.h
@@ -17,7 +17,7 @@ class TQTimer;
 
 class TQTetrixBoard : public TQFrame, public GenericTetrix
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTetrixBoard( TQWidget *parent=0, const char *name=0 );
 
diff --git a/examples/textedit/textedit.h b/examples/textedit/textedit.h
index 226e0e0e..77447b2a 100644
--- a/examples/textedit/textedit.h
+++ b/examples/textedit/textedit.h
@@ -20,7 +20,7 @@ class TQTextEdit;
 
 class TextEdit : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TextEdit( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/themes/themes.h b/examples/themes/themes.h
index e3789c6e..a11b6c79 100644
--- a/examples/themes/themes.h
+++ b/examples/themes/themes.h
@@ -17,7 +17,7 @@ class TQTabWidget;
 
 class Themes: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Themes( TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel );
diff --git a/examples/thread/prodcons/prodcons.cpp b/examples/thread/prodcons/prodcons.cpp
index ec4e68c5..7f182f85 100644
--- a/examples/thread/prodcons/prodcons.cpp
+++ b/examples/thread/prodcons/prodcons.cpp
@@ -220,7 +220,7 @@ void ConsThread::run()
 
 class ProdCons : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ProdCons();
diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp
index a32873a9..d31baf3d 100644
--- a/examples/thread/semaphores/main.cpp
+++ b/examples/thread/semaphores/main.cpp
@@ -141,7 +141,7 @@ void GreenThread::stop()
 
 class SemaphoreExample : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SemaphoreExample();
     ~SemaphoreExample();
diff --git a/examples/tictac/tictac.h b/examples/tictac/tictac.h
index e2c1917e..1bf3927e 100644
--- a/examples/tictac/tictac.h
+++ b/examples/tictac/tictac.h
@@ -24,7 +24,7 @@ class TQLabel;
 
 class TicTacButton : public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TicTacButton( TQWidget *parent );
     enum Type { Blank, Circle, Cross };
@@ -55,7 +55,7 @@ typedef TQMemArray		TicTacArray;
 
 class TicTacGameBoard : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TicTacGameBoard( int n, TQWidget *parent=0, const char *name=0 );
    ~TicTacGameBoard();
@@ -88,7 +88,7 @@ private:
 
 class TicTacToe : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TicTacToe( int boardSize=3, TQWidget *parent=0, const char *name=0 );
 private slots:
diff --git a/examples/tooltip/tooltip.h b/examples/tooltip/tooltip.h
index 7cd868eb..67c586d5 100644
--- a/examples/tooltip/tooltip.h
+++ b/examples/tooltip/tooltip.h
@@ -23,7 +23,7 @@ protected:
 
 class TellMe : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TellMe( TQWidget * parent = 0, const char * name = 0 );
     ~TellMe();
diff --git a/examples/widgets/widgets.h b/examples/widgets/widgets.h
index 8fc9cca5..12e814a6 100644
--- a/examples/widgets/widgets.h
+++ b/examples/widgets/widgets.h
@@ -27,7 +27,7 @@ class TQPopupMenu;
 
 class MyListView : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MyListView( TQWidget * parent = 0, const char *name = 0 )
 	: TQListView( parent, name ), selected(0)
@@ -64,7 +64,7 @@ private:
 
 class WidgetView : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     WidgetView( TQWidget *parent=0, const char *name=0 );
 
diff --git a/examples/wizard/wizard.h b/examples/wizard/wizard.h
index 332f1896..2bfbe7de 100644
--- a/examples/wizard/wizard.h
+++ b/examples/wizard/wizard.h
@@ -19,7 +19,7 @@ class TQLabel;
 
 class Wizard : public TQWizard
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Wizard( TQWidget *parent = 0, const char *name = 0 );
diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp
index bad40c30..8335660c 100644
--- a/examples/xform/xform.cpp
+++ b/examples/xform/xform.cpp
@@ -39,7 +39,7 @@ public:
 
 class XFormControl : public TQVBox, public ModeNames
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     XFormControl( const TQFont &initialFont, TQWidget *parent=0, const char *name=0 );
    ~XFormControl() {}
@@ -83,7 +83,7 @@ private:
 
 class ShowXForm : public TQWidget, public ModeNames
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ShowXForm( const TQFont &f, TQWidget *parent=0, const char *name=0 );
    ~ShowXForm() {}
@@ -434,7 +434,7 @@ void ShowXForm::showIt()
 
 class XFormCenter : public TQHBox, public ModeNames
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     XFormCenter( TQWidget *parent=0, const char *name=0 );
 public slots:
diff --git a/examples/xml/outliner/outlinetree.h b/examples/xml/outliner/outlinetree.h
index 891a44d3..e5fcb0d4 100644
--- a/examples/xml/outliner/outlinetree.h
+++ b/examples/xml/outliner/outlinetree.h
@@ -15,7 +15,7 @@
 
 class OutlineTree : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     OutlineTree( const TQString fileName, TQWidget *parent = 0, const char *name = 0 );
diff --git a/extensions/nsplugin/examples/grapher/grapher.cpp b/extensions/nsplugin/examples/grapher/grapher.cpp
index afd44453..c02a3c6c 100644
--- a/extensions/nsplugin/examples/grapher/grapher.cpp
+++ b/extensions/nsplugin/examples/grapher/grapher.cpp
@@ -48,7 +48,7 @@ public:
 //
 
 class Graph : public TQNPWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     // Constructs a Graph to display a GraphModel
     //
@@ -376,7 +376,7 @@ const char* Graph::styleName[] = { "Pie", "Bar", 0 };
 //
 
 class Grapher : public TQNPInstance, GraphModel {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     // Create a Grapher - all Grapher plugins are created
     // by one GrapherPlugin object.
diff --git a/extensions/nsplugin/examples/trivial/trivial.cpp b/extensions/nsplugin/examples/trivial/trivial.cpp
index 3223ed74..d4abe25e 100644
--- a/extensions/nsplugin/examples/trivial/trivial.cpp
+++ b/extensions/nsplugin/examples/trivial/trivial.cpp
@@ -4,7 +4,7 @@
 #include 
 
 class Trivial : public TQNPWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     void mouseReleaseEvent(TQMouseEvent* event)
     {
@@ -22,7 +22,7 @@ public:
 };
 
 class TrivialInstance : public TQNPInstance {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQNPWidget* newWindow()
     {
diff --git a/extensions/nsplugin/src/ntqnp.h b/extensions/nsplugin/src/ntqnp.h
index 0b34a21e..b58ac2a5 100644
--- a/extensions/nsplugin/src/ntqnp.h
+++ b/extensions/nsplugin/src/ntqnp.h
@@ -81,7 +81,7 @@ private:
 };
 
 class TQNPWidget : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQNPWidget();
     ~TQNPWidget();
@@ -98,7 +98,7 @@ private:
 };
 
 class TQNPInstance : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ~TQNPInstance();
 
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
index 2a2980d9..3ef3ba4d 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -55,7 +55,7 @@ class TQPopupMenu;
 
 class TQMultiInputContext : public TQInputContext
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQMultiInputContext();
     ~TQMultiInputContext();
@@ -78,7 +78,7 @@ public:
     bool isComposing() const;
     bool isPreeditRelocationEnabled();
     
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
     TQPtrList *qt4menus();
 #endif
     TQPtrList *menus();
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
index 9b2039d9..95c98792 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
@@ -48,7 +48,7 @@
 
 class TQMultiInputContextPlugin : public TQInputContextPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQMultiInputContextPlugin();
     ~TQMultiInputContextPlugin();
diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
index a521555f..8b5fd221 100644
--- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
+++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
@@ -47,7 +47,7 @@
 
 class TQNoneInputContextPlugin : public TQInputContextPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQNoneInputContextPlugin();
     ~TQNoneInputContextPlugin();
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.h b/plugins/src/inputmethods/simple/qsimpleinputcontext.h
index 3eb56133..d6499bd7 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontext.h
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.h
@@ -61,7 +61,7 @@ struct TQComposeTable {
 
 
 class TQSimpleInputContext : public TQInputContext {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSimpleInputContext();
     ~TQSimpleInputContext();
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
index dbe7f471..84e23b31 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
@@ -48,7 +48,7 @@
 
 class TQSimpleInputContextPlugin : public TQInputContextPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSimpleInputContextPlugin();
     ~TQSimpleInputContextPlugin();
diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h
index 70499de3..449e219e 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext.h
+++ b/plugins/src/inputmethods/xim/qximinputcontext.h
@@ -70,7 +70,7 @@ class TQString;
 
 class TQXIMInputContext : public TQInputContext
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 #ifdef Q_WS_X11
     TQXIMInputContext();
diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.h b/plugins/src/inputmethods/xim/qximinputcontextplugin.h
index d58d5d53..d930eeec 100644
--- a/plugins/src/inputmethods/xim/qximinputcontextplugin.h
+++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.h
@@ -48,7 +48,7 @@
 
 class TQXIMInputContextPlugin : public TQInputContextPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQXIMInputContextPlugin();
     ~TQXIMInputContextPlugin();
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
index f89559db..db7f7d3d 100644
--- a/qmake/book/qmake-commandreference.leaf
+++ b/qmake/book/qmake-commandreference.leaf
@@ -676,7 +676,7 @@ rarely needs to be modified.
 \section3 OBJMOC
 
 This variable is set by \e qmake if files can be found that
-contain the Q_OBJECT macro.  \c OBJMOC contains the
+contain the TQ_OBJECT macro.  \c OBJMOC contains the
 name of all intermediate moc object files. The value of this variable
 is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
@@ -1605,7 +1605,7 @@ The value of this variable is typically handled by \e qmake or
 \section3 SRCMOC
 
 This variable is set by \e qmake if files can be found that
-contain the Q_OBJECT macro.  \c SRCMOC contains the
+contain the TQ_OBJECT macro.  \c SRCMOC contains the
 name of all the generated moc files. The value of this variable
 is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 476e9f9b..b4348588 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -134,9 +134,9 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 
     bool ignore_qobject = FALSE;
     int line_count = 1;
- /* qmake ignore Q_OBJECT */
-#define COMP_LEN 8 //strlen("Q_OBJECT")
-#define OBJ_LEN 8 //strlen("Q_OBJECT")
+ /* qmake ignore TQ_OBJECT */
+#define COMP_LEN 9 //strlen("TQ_OBJECT")
+#define OBJ_LEN 9 //strlen("TQ_OBJECT")
 #define DIS_LEN 10 //strlen("Q_DISPATCH")
     int x;
     for(x = 0; x < (total_size_read-COMP_LEN); x++) {
@@ -150,8 +150,8 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 		    for( ;x < total_size_read; x++) {
 			if(*(big_buffer + x) == 't' || *(big_buffer + x) == 'q') { //ignore
 			    if(total_size_read >= (x + 20)) {
-				if(!strncmp(big_buffer + x + 1, "make ignore Q_OBJECT", 20)) {
-				    debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore Q_OBJECT\"",
+				if(!strncmp(big_buffer + x + 1, "make ignore TQ_OBJECT", 20)) {
+				    debug_msg(2, "Mocgen: %s:%d Found \"qmake ignore TQ_OBJECT\"",
 					      fn_target.latin1(), line_count);
 				    x += 20;
 				    ignore_qobject = TRUE;
@@ -172,13 +172,13 @@ MakefileGenerator::generateMocList(const TQString &fn_target)
 #define SYMBOL_CHAR(x) ((x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z') || \
 			(x <= '0' && x >= '9') || x == '_')
 
-	bool interesting = *(big_buffer+x) == 'Q' && (!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN) ||
+	bool interesting = ((*(big_buffer+x) == 'T') || (*(big_buffer+x) == 'Q')) && (!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN) ||
 						      !strncmp(big_buffer+x, "Q_DISPATCH", DIS_LEN));
 	if(interesting) {
 	    int len = 0;
-	    if(!strncmp(big_buffer+x, "Q_OBJECT", OBJ_LEN)) {
+	    if(!strncmp(big_buffer+x, "TQ_OBJECT", OBJ_LEN)) {
 		if(ignore_qobject) {
-		    debug_msg(2, "Mocgen: %s:%d Ignoring Q_OBJECT", fn_target.latin1(), line_count);
+		    debug_msg(2, "Mocgen: %s:%d Ignoring TQ_OBJECT", fn_target.latin1(), line_count);
 		    interesting = FALSE;
 		}
 		len=OBJ_LEN;
@@ -2101,14 +2101,14 @@ TQString MakefileGenerator::buildArgs()
 	//arguments
 	for(TQStringList::Iterator it = Option::before_user_vars.begin();
 	    it != Option::before_user_vars.end(); ++it) {
-	    if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
+	    if((*it).left(tqstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
 		ret += " \"" + (*it) + "\"";
 	}
 	if(Option::after_user_vars.count()) {
 	    ret += " -after ";
 	    for(TQStringList::Iterator it = Option::after_user_vars.begin();
 		it != Option::after_user_vars.end(); ++it) {
-		if((*it).left(qstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
+		if((*it).left(tqstrlen("QMAKE_ABSOLUTE_SOURCE_PATH")) != "QMAKE_ABSOLUTE_SOURCE_PATH")
 		    ret += " \"" + (*it) + "\"";
 	    }
 	}
@@ -2145,7 +2145,7 @@ MakefileGenerator::writeHeader(TQTextStream &t)
     time_t foo = time(NULL);
     t << "#############################################################################" << endl;
     t << "# Makefile for building: " << var("TARGET") << endl;
-    t << "# Generated by qmake (" << qmake_version() << ") (TQt " << QT_VERSION_STR << ") on: " << ctime(&foo);
+    t << "# Generated by qmake (" << qmake_version() << ") (TQt " << TQT_VERSION_STR << ") on: " << ctime(&foo);
     t << "# Project:  " << fileFixify(project->projectFile()) << endl;
     t << "# Template: " << var("TEMPLATE") << endl;
     t << "# Command: " << build_args() << endl;
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index edaa8d13..798edc26 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1433,7 +1433,7 @@ UnixMakefileGenerator::writeLibtoolFile()
     t << "# " << lname << " - a libtool library file\n";
     time_t now = time(NULL);
     t << "# Generated by qmake/libtool (" << qmake_version() << ") (TQt "
-      << QT_VERSION_STR << ") on: " << ctime(&now) << "\n";
+      << TQT_VERSION_STR << ") on: " << ctime(&now) << "\n";
 
     t << "# The name that we can dlopen(3).\n"
       << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 8865720e..d57e39e6 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -225,7 +225,7 @@ Option::internalParseCommandLine(int argc, char **argv, int skip)
 	    } else if(opt == "d") {
 		Option::debug_level++;
 	    } else if(opt == "version" || opt == "v" || opt == "-version") {
-		fprintf(stderr, "Qmake version: %s (TQt %s)\n", qmake_version(), QT_VERSION_STR);
+		fprintf(stderr, "Qmake version: %s (TQt %s)\n", qmake_version(), TQT_VERSION_STR);
 		fprintf(stderr, "Qmake is free software from Trolltech ASA.\n");
 		return QMAKE_CMDLINE_BAIL;
 	    } else if(opt == "h" || opt == "help") {
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 0a237945..d905b089 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -685,7 +685,7 @@ TQMakeProject::read(uchar cmd)
 //	    fprintf(stderr,"Current QT version number: " + ver + "\n");
 	    if (ver != "" && ver != test_version) {
 		ver = test_version;
-		fprintf(stderr,"Changed QT version number to " + test_version + "!\n");
+		fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii());
 	    }
 	}
     }
diff --git a/src/attic/qtmultilineedit.h b/src/attic/qtmultilineedit.h
index 3b7ccd25..f74b66ef 100644
--- a/src/attic/qtmultilineedit.h
+++ b/src/attic/qtmultilineedit.h
@@ -28,7 +28,7 @@ class TQValidator;
 
 class TQtMultiLineEdit : public TQtTableView
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( EchoMode WordWrap WrapPolicy )
     Q_PROPERTY( int numLines READ numLines )
     Q_PROPERTY( bool atBeginning READ atBeginning )
@@ -317,7 +317,7 @@ private:
     void processCmd( TQtMultiLineEditCommand*, bool );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQtMultiLineEdit( const TQtMultiLineEdit & );
     TQtMultiLineEdit &operator=( const TQtMultiLineEdit & );
 #endif
diff --git a/src/attic/qttableview.cpp b/src/attic/qttableview.cpp
index e608ae92..21fefbd6 100644
--- a/src/attic/qttableview.cpp
+++ b/src/attic/qttableview.cpp
@@ -1072,7 +1072,7 @@ void TQtTableView::coverCornerSquare( bool enable )
     coveringCornerSquare = enable;
     if ( !cornerSquare && enable ) {
 	cornerSquare = new TQCornerSquare( this );
-	Q_CHECK_PTR( cornerSquare );
+	TQ_CHECK_PTR( cornerSquare );
 	cornerSquare->setGeometry( maxViewX() + frameWidth() + 1,
 				   maxViewY() + frameWidth() + 1,
                                    VSBEXT,
@@ -1442,7 +1442,7 @@ TQScrollBar *TQtTableView::verticalScrollBar() const
 	sb->setCursor( arrowCursor );
 #endif
         sb->resize( sb->sizeHint() ); // height is irrelevant
-	Q_CHECK_PTR(sb);
+	TQ_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
 	sb->setFocusPolicy( NoFocus );
 	connect( sb, SIGNAL(valueChanged(int)),
@@ -1474,7 +1474,7 @@ TQScrollBar *TQtTableView::horizontalScrollBar() const
 #endif
 	sb->resize( sb->sizeHint() ); // width is irrelevant
 	sb->setFocusPolicy( NoFocus );
-	Q_CHECK_PTR(sb);
+	TQ_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
 	connect( sb, SIGNAL(valueChanged(int)),
 		 SLOT(horSbValue(int)));
diff --git a/src/attic/qttableview.h b/src/attic/qttableview.h
index 4dfb38ce..43468c83 100644
--- a/src/attic/qttableview.h
+++ b/src/attic/qttableview.h
@@ -26,7 +26,7 @@ class TQCornerSquare;
 
 class TQtTableView : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     virtual void setBackgroundColor( const TQColor & );
     virtual void setPalette( const TQPalette & );
@@ -168,7 +168,7 @@ private:
     TQCornerSquare *cornerSquare;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQtTableView( const TQtTableView & );
     TQtTableView &operator=( const TQtTableView & );
 #endif
diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h
index b104fd8a..b3c25470 100644
--- a/src/canvas/ntqcanvas.h
+++ b/src/canvas/ntqcanvas.h
@@ -51,7 +51,7 @@
 #include "ntqpointarray.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
+#if !defined( TQT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
 #define TQM_EXPORT_CANVAS
 #define TQM_TEMPLATE_EXTERN_CANVAS
 #else
@@ -218,7 +218,7 @@ class TQCanvasData;
 
 class TQM_EXPORT_CANVAS TQCanvas : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQCanvas( TQObject* parent = 0, const char* name = 0 );
     TQCanvas(int w, int h);
@@ -353,7 +353,7 @@ private:
 
     friend void qt_unview(TQCanvas* c);
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQCanvas( const TQCanvas & );
     TQCanvas &operator=( const TQCanvas & );
 #endif
@@ -363,7 +363,7 @@ class TQCanvasViewData;
 
 class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0);
@@ -393,7 +393,7 @@ private slots:
     void updateContentsSize();
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQCanvasView( const TQCanvasView & );
     TQCanvasView &operator=( const TQCanvasView & );
 #endif
@@ -417,7 +417,7 @@ public:
     void setOffset(int x, int y) { hotx = x; hoty = y; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasPixmap( const TQCanvasPixmap & );
     TQCanvasPixmap &operator=( const TQCanvasPixmap & );
 #endif
@@ -463,7 +463,7 @@ public:
 	{ return (uint)framecount; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasPixmapArray( const TQCanvasPixmapArray & );
     TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & );
 #endif
@@ -529,7 +529,7 @@ public:
     void draw(TQPainter& painter);
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasSprite( const TQCanvasSprite & );
     TQCanvasSprite &operator=( const TQCanvasSprite & );
 #endif
@@ -786,7 +786,7 @@ protected:
     virtual void draw(TQPainter&);
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasText( const TQCanvasText & );
     TQCanvasText &operator=( const TQCanvasText & );
 #endif
diff --git a/src/codecs/ntqtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h
index 787941f5..d0ac8103 100644
--- a/src/codecs/ntqtextcodecplugin.h
+++ b/src/codecs/ntqtextcodecplugin.h
@@ -52,7 +52,7 @@ class TQTextCodecPluginPrivate;
 
 class Q_EXPORT TQTextCodecPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTextCodecPlugin();
     ~TQTextCodecPlugin();
diff --git a/src/codecs/qfontjpcodec.cpp b/src/codecs/qfontjpcodec.cpp
index 365f21e0..bd21e167 100644
--- a/src/codecs/qfontjpcodec.cpp
+++ b/src/codecs/qfontjpcodec.cpp
@@ -109,7 +109,7 @@ void TQFontJis0201Codec::fromUnicode(const TQChar *in, unsigned short *out, int
 
 int TQFontJis0201Codec::heuristicNameMatch(const char* hint) const
 {
-    if ( qstrncmp( hint, "jisx0201", 8 ) == 0 )
+    if ( tqstrncmp( hint, "jisx0201", 8 ) == 0 )
 	return 20;
     return -1;
 
@@ -137,7 +137,7 @@ int TQFontJis0208Codec::heuristicContentMatch(const char *, int) const
 
 int TQFontJis0208Codec::heuristicNameMatch(const char *hint) const
 {
-    if ( qstrncmp( hint, "jisx0208.", 9 ) == 0 )
+    if ( tqstrncmp( hint, "jisx0208.", 9 ) == 0 )
 	return 20;
     return -1;
 }
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index 93896707..74f83336 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -117,7 +117,7 @@
 
 #include "ntqgb18030codec.h"
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "move obsolete header  into the src/compat directory"
 #endif
 
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 23b6ff51..c03529df 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -504,17 +504,17 @@ int TQTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
 {
     // if they're the same, return a perfect score.
     if ( name && hint && *name && *hint && qstricmp( name, hint ) == 0 )
-	return qstrlen( hint );
+	return tqstrlen( hint );
 
     // if the letters and numbers are the same, we have an "almost"
     // perfect match.
     TQString h( lettersAndNumbers( hint ) );
     TQString n( lettersAndNumbers( name ) );
     if ( h == n )
-	return qstrlen( hint )-1;
+	return tqstrlen( hint )-1;
 
     if ( h.stripWhiteSpace() == n.stripWhiteSpace() )
-	return qstrlen( hint )-2;
+	return tqstrlen( hint )-2;
 
     // could do some more here, but I don't think it's worth it
 
@@ -1115,7 +1115,7 @@ TQString TQTextCodec::toUnicode(const TQCString& a) const
 */
 TQString TQTextCodec::toUnicode(const char* chars) const
 {
-    return toUnicode(chars,qstrlen(chars));
+    return toUnicode(chars,tqstrlen(chars));
 }
 
 /*!
diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp
index 71e5ed12..df9757e2 100644
--- a/src/codecs/qtextcodecfactory.cpp
+++ b/src/codecs/qtextcodecfactory.cpp
@@ -79,7 +79,7 @@ static void create_manager()
 	new TQPluginManager(IID_QTextCodecFactory,
 						       TQApplication::libraryPaths(), "/codecs",
 						       FALSE);
-    Q_CHECK_PTR( manager );
+    TQ_CHECK_PTR( manager );
     cleanup_manager.set( &manager );
 }
 
diff --git a/src/dialogs/ntqcolordialog.h b/src/dialogs/ntqcolordialog.h
index c3490ef5..6c64f3ba 100644
--- a/src/dialogs/ntqcolordialog.h
+++ b/src/dialogs/ntqcolordialog.h
@@ -51,7 +51,7 @@ class TQColorDialogPrivate;
 
 class Q_EXPORT TQColorDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static TQColor getColor( const TQColor& init = white, TQWidget* parent=0, const char* name=0 );
@@ -82,7 +82,7 @@ private:	// Disabled copy constructor and operator=
     friend class TQColorDialogPrivate;
     friend class TQColorShower;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQColorDialog( const TQColorDialog & );
     TQColorDialog& operator=( const TQColorDialog & );
 #endif
diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h
index bc9670af..113703d6 100644
--- a/src/dialogs/ntqdialog.h
+++ b/src/dialogs/ntqdialog.h
@@ -46,7 +46,7 @@
 #endif // QT_H
 #ifndef QT_NO_DIALOG
 #if 0
-Q_OBJECT
+TQ_OBJECT
 #endif
 
 class TQPushButton;
@@ -55,7 +55,7 @@ class TQDialogPrivate;
 class Q_EXPORT TQDialog : public TQWidget
 {
 friend class TQPushButton;
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
     Q_PROPERTY( bool modal READ isModal WRITE setModal )
 
@@ -131,7 +131,7 @@ private:
     TQDialogPrivate* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDialog( const TQDialog & );
     TQDialog &operator=( const TQDialog & );
 #endif
diff --git a/src/dialogs/ntqerrormessage.h b/src/dialogs/ntqerrormessage.h
index 91634fbf..ebc4a233 100644
--- a/src/dialogs/ntqerrormessage.h
+++ b/src/dialogs/ntqerrormessage.h
@@ -55,7 +55,7 @@ template class TQDict;
 
 
 class Q_EXPORT TQErrorMessage: public TQDialog {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQErrorMessage( TQWidget* parent, const char* name=0 );
     ~TQErrorMessage();
@@ -78,7 +78,7 @@ private:
 
     bool nextPending();
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQErrorMessage( const TQErrorMessage & );
     TQErrorMessage &operator=( const TQErrorMessage & );
 #endif
diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/ntqfiledialog.h
index cc811b63..aeaee742 100644
--- a/src/dialogs/ntqfiledialog.h
+++ b/src/dialogs/ntqfiledialog.h
@@ -69,13 +69,13 @@ class TQFileDialogTQFileListView;
 
 class Q_EXPORT TQFileIconProvider : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQFileIconProvider( TQObject * parent = 0, const char* name = 0 );
     virtual const TQPixmap * pixmap( const TQFileInfo & );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFileIconProvider( const TQFileIconProvider & );
     TQFileIconProvider& operator=( const TQFileIconProvider & );
 #endif
@@ -91,7 +91,7 @@ public:
 
 class Q_EXPORT TQFileDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Mode ViewMode PreviewMode )
     // ##### Why are this read-only properties ?
     Q_PROPERTY( TQString selectedFile READ selectedFile )
@@ -336,7 +336,7 @@ private:
 
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFileDialog( const TQFileDialog & );
     TQFileDialog &operator=( const TQFileDialog & );
 #endif
diff --git a/src/dialogs/ntqfontdialog.h b/src/dialogs/ntqfontdialog.h
index bcb5e06d..2aaa2424 100644
--- a/src/dialogs/ntqfontdialog.h
+++ b/src/dialogs/ntqfontdialog.h
@@ -64,7 +64,7 @@ class TQFontDialogPrivate;
 
 class Q_EXPORT TQFontDialog: public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static TQFont getFont( bool *ok, const TQFont &def,
@@ -101,7 +101,7 @@ private:
     TQFontDialogPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFontDialog( const TQFontDialog & );
     TQFontDialog& operator=( const TQFontDialog & );
 #endif
diff --git a/src/dialogs/ntqinputdialog.h b/src/dialogs/ntqinputdialog.h
index 7b21503b..e48b6230 100644
--- a/src/dialogs/ntqinputdialog.h
+++ b/src/dialogs/ntqinputdialog.h
@@ -55,7 +55,7 @@ class TQInputDialogPrivate;
 
 class Q_EXPORT TQInputDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     enum Type { LineEdit, SpinBox, ComboBox, EditableComboBox };
@@ -95,7 +95,7 @@ private:
     friend class TQInputDialogPrivate; /* to avoid 'has no friends' warnings... */
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQInputDialog( const TQInputDialog & );
     TQInputDialog &operator=( const TQInputDialog & );
 #endif
diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h
index 5ab38f78..0296612a 100644
--- a/src/dialogs/ntqmessagebox.h
+++ b/src/dialogs/ntqmessagebox.h
@@ -53,7 +53,7 @@ struct TQMessageBoxData;
 
 class Q_EXPORT TQMessageBox : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Icon )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( Icon icon READ icon WRITE setIcon )
@@ -191,7 +191,7 @@ private:
     void       *reserved2;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMessageBox( const TQMessageBox & );
     TQMessageBox &operator=( const TQMessageBox & );
 #endif
@@ -213,7 +213,7 @@ TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<
 (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\
 (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \
 TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' requires TQt "\
- "%2, found TQt %3.").arg(TQString::fromLatin1(qAppName())).arg(TQString::fromLatin1(\
+ "%2, found TQt %3.").arg(TQString::fromLatin1(tqAppName())).arg(TQString::fromLatin1(\
 str)).arg(TQString::fromLatin1(qVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\
 "Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); qFatal(s.ascii()); }}
 
diff --git a/src/dialogs/ntqprintdialog.h b/src/dialogs/ntqprintdialog.h
index ea46c6fe..8f79bf0b 100644
--- a/src/dialogs/ntqprintdialog.h
+++ b/src/dialogs/ntqprintdialog.h
@@ -53,7 +53,7 @@ class TQListView;
 
 class Q_EXPORT TQPrintDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQPrintDialog( TQPrinter *, TQWidget* parent=0, const char* name=0 );
     ~TQPrintDialog();
@@ -92,7 +92,7 @@ private:
     TQGroupBox * setupPrinterSettings();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPrintDialog( const TQPrintDialog & );
     TQPrintDialog &operator=( const TQPrintDialog & );
 #endif
diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h
index e480f286..77b8af10 100644
--- a/src/dialogs/ntqprogressdialog.h
+++ b/src/dialogs/ntqprogressdialog.h
@@ -55,7 +55,7 @@ class TQProgressDialogData;
 
 class Q_EXPORT TQProgressDialog : public TQDialog
 {
-    Q_OBJECT
+    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 )
@@ -130,7 +130,7 @@ private:
     TQTimer	  *forceTimer;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQProgressDialog( const TQProgressDialog & );
     TQProgressDialog &operator=( const TQProgressDialog & );
 #endif
diff --git a/src/dialogs/ntqsemimodal.h b/src/dialogs/ntqsemimodal.h
index ff015b7f..eaa87c43 100644
--- a/src/dialogs/ntqsemimodal.h
+++ b/src/dialogs/ntqsemimodal.h
@@ -49,13 +49,13 @@
 #ifndef QT_NO_SEMIMODAL
 class Q_EXPORT TQSemiModal : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSemiModal( TQWidget* parent=0, const char* name=0, bool modal=FALSE, WFlags f=0 )
 	: TQDialog( parent, name, modal, f ) { }
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSemiModal( const TQSemiModal & );
     TQSemiModal &operator=( const TQSemiModal & );
 #endif
diff --git a/src/dialogs/ntqtabdialog.h b/src/dialogs/ntqtabdialog.h
index 21622528..826d3b6d 100644
--- a/src/dialogs/ntqtabdialog.h
+++ b/src/dialogs/ntqtabdialog.h
@@ -54,7 +54,7 @@ class  TQTabDialogPrivate;
 
 class Q_EXPORT TQTabDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTabDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE,
 		WFlags f=0 );
@@ -135,7 +135,7 @@ private:
 
     TQTabDialogPrivate *d;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabDialog( const TQTabDialog & );
     TQTabDialog& operator=( const TQTabDialog & );
 #endif
diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/ntqwizard.h
index b366f29c..d0c90b38 100644
--- a/src/dialogs/ntqwizard.h
+++ b/src/dialogs/ntqwizard.h
@@ -53,7 +53,7 @@ class TQWizardPrivate;
 
 class Q_EXPORT TQWizard : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont )
 
 public:
@@ -131,7 +131,7 @@ private:
     TQWizardPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWizard( const TQWizard & );
     TQWizard& operator=( const TQWizard & );
 #endif
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index e275f02b..68838c45 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -73,7 +73,7 @@ struct TQWellArrayData;
 
 class TQWellArray : public TQGridView
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int selectedColumn READ selectedColumn )
     Q_PROPERTY( int selectedRow READ selectedRow )
 
@@ -120,7 +120,7 @@ private:
     TQWellArrayData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWellArray( const TQWellArray & );
     TQWellArray& operator=( const TQWellArray & );
 #endif
@@ -632,7 +632,7 @@ void TQColorWell::mouseReleaseEvent( TQMouseEvent *e )
 
 class TQColorPicker : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQColorPicker(TQWidget* parent=0, const char* name=0);
     ~TQColorPicker();
@@ -666,7 +666,7 @@ static int pHeight = 200;
 
 class TQColorLuminancePicker : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQColorLuminancePicker(TQWidget* parent=0, const char* name=0);
     ~TQColorLuminancePicker();
@@ -928,7 +928,7 @@ public:
 
 class TQColorShower : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQColorShower( TQWidget *parent, const char *name=0 );
 
@@ -968,7 +968,7 @@ private:
 
 class TQColorShowLabel : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQColorShowLabel( TQWidget *parent ) : TQFrame( parent, "qt_colorshow_lbl" ) {
@@ -1229,7 +1229,7 @@ void TQColorShower::setHsv( int h, int s, int v )
 
 class TQColorDialogPrivate : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     TQColorDialogPrivate( TQColorDialog *p );
     TQRgb currentColor() const { return cs->currentColor(); }
@@ -1539,7 +1539,7 @@ TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok,
     int allocContext = TQColor::enterAllocContext();
     TQColorDialog *dlg = new TQColorDialog( parent, name, TRUE );  //modal
 
-    Q_CHECK_PTR( dlg );
+    TQ_CHECK_PTR( dlg );
 #ifndef QT_NO_WIDGET_TOPEXTRA
     dlg->setCaption( TQColorDialog::tr( "Select color" ) );
 #endif
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index cfa6dd39..fddc5716 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -629,7 +629,7 @@ static void makeVariables() {
 
 class TQRenameEdit : public TQLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQRenameEdit( TQWidget *parent )
@@ -657,7 +657,7 @@ class TQFileListBox : public TQListBox
 {
     friend class TQFileDialog;
 
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     TQFileListBox( TQWidget *parent, TQFileDialog *d );
@@ -707,7 +707,7 @@ private:
 
 class TQFileDialogTQFileListView : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFileDialogTQFileListView( TQWidget *parent, TQFileDialog *d );
@@ -768,7 +768,7 @@ private:
 
 class TQFDProgressAnimation : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFDProgressAnimation( TQWidget *parent );
@@ -842,7 +842,7 @@ void TQFDProgressAnimation::paintEvent( TQPaintEvent * )
 
 class TQFDProgressDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFDProgressDialog( TQWidget *parent, const TQString &fn, int steps );
@@ -2006,7 +2006,7 @@ TQString TQFileDialogPrivate::File::text( int column ) const
         return info.name();
     case 1:
 	if ( info.isFile() ) {
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "clean up Large File Support"
 #elif defined(QT_ABI_QT4)
 	    TQIODevice::Offset size = info.size();
@@ -3511,7 +3511,7 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
 
     TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofn", TRUE );
 
-    Q_CHECK_PTR( dlg );
+    TQ_CHECK_PTR( dlg );
 #ifndef QT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
@@ -3636,7 +3636,7 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
 
     TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gsfn", TRUE );
 
-    Q_CHECK_PTR( dlg );
+    TQ_CHECK_PTR( dlg );
 #ifndef QT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
@@ -4548,7 +4548,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
 
     TQFileDialog *dlg = new TQFileDialog( parent, name ? name : "qt_filedlg_ged", TRUE );
 
-    Q_CHECK_PTR( dlg );
+    TQ_CHECK_PTR( dlg );
 #ifndef QT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
@@ -5708,7 +5708,7 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter,
 
     TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofns", TRUE );
 
-    Q_CHECK_PTR( dlg );
+    TQ_CHECK_PTR( dlg );
 #ifndef QT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index fc902b5a..ce6c505b 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -67,7 +67,7 @@ extern bool qt_use_native_dialogs;
 
 class TQMessageBoxLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQMessageBoxLabel( TQWidget* parent ) : TQLabel( parent, "messageBoxText")
     {
@@ -605,12 +605,12 @@ void TQMessageBox::init( int button0, int button1, int button2 )
 	    "
    TQt is a Trolltech product. "
 	    "See http://www.trolltech.com/qt/ "
 	    "for more information.
    "
-	    ).arg( QT_VERSION_STR );
+	    ).arg( TQT_VERSION_STR );
 #endif
 
     }
     label = new TQMessageBoxLabel( this );
-    Q_CHECK_PTR( label );
+    TQ_CHECK_PTR( label );
 
     if ( (button2 && !button1) || (button1 && !button0) ) {
 #if defined(QT_CHECK_RANGE)
@@ -619,7 +619,7 @@ void TQMessageBox::init( int button0, int button1, int button2 )
         button0 = button1 = button2 = 0;
     }
     mbd = new TQMessageBoxData(this);
-    Q_CHECK_PTR( mbd );
+    TQ_CHECK_PTR( mbd );
     mbd->icon = NoIcon;
     mbd->iconLabel.setPixmap( TQPixmap() );
     mbd->numButtons = 0;
@@ -1128,7 +1128,7 @@ int TQMessageBox::information( TQWidget *parent,
                                        button0, button1, button2,
                                        parent, "qt_msgbox_information", TRUE,
 				       WDestructiveClose);
-    Q_CHECK_PTR( mb );
+    TQ_CHECK_PTR( mb );
     return mb->exec();
 }
 
@@ -1179,7 +1179,7 @@ int TQMessageBox::question( TQWidget *parent,
                                        button0, button1, button2,
                                        parent, "qt_msgbox_information", TRUE,
 				       WDestructiveClose);
-    Q_CHECK_PTR( mb );
+    TQ_CHECK_PTR( mb );
     return mb->exec();
 }
 
@@ -1231,7 +1231,7 @@ int TQMessageBox::warning( TQWidget *parent,
                                        button0, button1, button2,
                                        parent, "qt_msgbox_warning", TRUE,
 				       WDestructiveClose);
-    Q_CHECK_PTR( mb );
+    TQ_CHECK_PTR( mb );
     return mb->exec();
 }
 
@@ -1283,7 +1283,7 @@ int TQMessageBox::critical( TQWidget *parent,
                                        button0, button1, button2,
                                        parent, "qt_msgbox_critical", TRUE,
 				       WDestructiveClose);
-    Q_CHECK_PTR( mb );
+    TQ_CHECK_PTR( mb );
     return mb->exec();
 }
 
@@ -1314,7 +1314,7 @@ void TQMessageBox::about( TQWidget *parent, const TQString &caption,
                                        Ok + Default, 0, 0,
                                        parent, "qt_msgbox_simple_about_box", TRUE,
 				       WDestructiveClose);
-    Q_CHECK_PTR( mb );
+    TQ_CHECK_PTR( mb );
 #ifndef QT_NO_WIDGET_TOPEXTRA
     const TQPixmap *pm = parent ? parent->icon() : 0;
     if ( pm && !pm->isNull() )
@@ -1371,7 +1371,7 @@ static int textBox( TQWidget *parent, TQMessageBox::Icon severity,
                                        b[0], b[1], b[2],
                                        parent, "qt_msgbox_information", TRUE,
 				       TQt::WDestructiveClose);
-    Q_CHECK_PTR( mb );
+    TQ_CHECK_PTR( mb );
     if ( button0Text.isEmpty() )
         mb->setButtonText( 1, TQMessageBox::tr(mb_texts[TQMessageBox::Ok]) );
     else
@@ -1594,7 +1594,7 @@ int TQMessageBox::critical( TQWidget *parent, const TQString &caption,
 void TQMessageBox::aboutTQt( TQWidget *parent, const TQString &caption )
 {
     TQMessageBox *mb = new TQMessageBox( parent, "qt_msgbox_about_qt" );
-    Q_CHECK_PTR( mb );
+    TQ_CHECK_PTR( mb );
     mb->setWFlags( WDestructiveClose );
 
 #ifndef QT_NO_WIDGET_TOPEXTRA
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp
index 2315e4ac..c50b748e 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/qtabdialog.cpp
@@ -187,14 +187,14 @@ TQTabDialog::TQTabDialog( TQWidget *parent, const char *name, bool modal,
     : TQDialog( parent, name, modal, f )
 {
     d = new TQTabDialogPrivate;
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
 
     d->tw = new TQTabWidget( this, "tab widget" );
     connect ( d->tw, SIGNAL ( selected(const TQString&) ), this, SIGNAL( selected(const TQString&) ) );
     connect ( d->tw, SIGNAL ( currentChanged(TQWidget*) ), this, SIGNAL( currentChanged(TQWidget*) ) );
 
     d->ok = new TQPushButton( this, "ok" );
-    Q_CHECK_PTR( d->ok );
+    TQ_CHECK_PTR( d->ok );
     d->ok->setText( tr("OK") );
     d->ok->setDefault( TRUE );
     connect( d->ok, SIGNAL(clicked()),
diff --git a/src/iconview/ntqiconview.h b/src/iconview/ntqiconview.h
index ea905fa5..6df2991f 100644
--- a/src/iconview/ntqiconview.h
+++ b/src/iconview/ntqiconview.h
@@ -55,7 +55,7 @@
 
 #ifndef QT_NO_ICONVIEW
 
-#if !defined( QT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
+#if !defined( TQT_MODULE_ICONVIEW ) || defined( QT_INTERNAL_ICONVIEW )
 #define TQM_EXPORT_ICONVIEW
 #else
 #define TQM_EXPORT_ICONVIEW Q_EXPORT
@@ -94,7 +94,7 @@ private:
 
 class TQM_EXPORT_ICONVIEW TQIconDrag : public TQDragObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQIconDrag( TQWidget * dragSource, const char* name = 0 );
     virtual ~TQIconDrag();
@@ -111,7 +111,7 @@ private:
 
     friend class TQIconView;
     friend class TQIconViewPrivate;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQIconDrag( const TQIconDrag & );
     TQIconDrag &operator=( const TQIconDrag & );
 #endif
@@ -275,7 +275,7 @@ class TQM_EXPORT_ICONVIEW TQIconView : public TQScrollView
     friend class TQIconViewPrivate;
     friend class TQIconViewToolTip;
 
-    Q_OBJECT
+    TQ_OBJECT
     // #### sorting and sort direction do not work
     Q_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode )
     Q_PROPERTY( bool sorting READ sorting )
@@ -507,7 +507,7 @@ private:
     TQIconViewPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIconView( const TQIconView & );
     TQIconView& operator=( const TQIconView & );
 #endif
diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp
index 8b34b288..47b1a1cf 100644
--- a/src/iconview/qiconview.cpp
+++ b/src/iconview/qiconview.cpp
@@ -441,7 +441,7 @@ protected:
     TQIconViewItem *item;
     TQString startText;
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQIconViewItemLineEdit( const TQIconViewItemLineEdit & );
     TQIconViewItemLineEdit &operator=( const TQIconViewItemLineEdit & );
 #endif
diff --git a/src/inputmethod/ntqinputcontextplugin.h b/src/inputmethod/ntqinputcontextplugin.h
index 92875c52..bec6dc5b 100644
--- a/src/inputmethod/ntqinputcontextplugin.h
+++ b/src/inputmethod/ntqinputcontextplugin.h
@@ -49,7 +49,7 @@ class TQInputContextPluginPrivate;
 
 class Q_EXPORT TQInputContextPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQInputContextPlugin();
     ~TQInputContextPlugin();
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp
index ae439152..e0264697 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/qinputcontextfactory.cpp
@@ -76,7 +76,7 @@ static void create_manager()
 
     manager = new TQPluginManager( IID_QInputContextFactory, TQApplication::libraryPaths(), "/inputmethods", FALSE );
 
-    Q_CHECK_PTR( manager );
+    TQ_CHECK_PTR( manager );
     cleanup_manager.set( &manager );
 }
 
diff --git a/src/kernel/ntqaccel.h b/src/kernel/ntqaccel.h
index 717d2ace..ae79380c 100644
--- a/src/kernel/ntqaccel.h
+++ b/src/kernel/ntqaccel.h
@@ -52,7 +52,7 @@ class TQAccelPrivate;
 
 class Q_EXPORT TQAccel : public TQObject			// accelerator class
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQAccel( TQWidget *parent, const char *name=0 );
     TQAccel( TQWidget* watch, TQObject *parent, const char *name=0 );
@@ -98,7 +98,7 @@ private:
     TQAccelPrivate * d;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQAccel( const TQAccel & );
     TQAccel &operator=( const TQAccel & );
 #endif
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index 2ab77976..fbeed98e 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -72,7 +72,7 @@ extern Q_EXPORT TQApplication *qApp;		// global application object
 
 class Q_EXPORT TQApplication : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQApplication( int &argc, char **argv );
     TQApplication( int &argc, char **argv, bool GUIenabled );
@@ -439,7 +439,7 @@ private:
     friend class TQInputContext;
 #endif
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQApplication( const TQApplication & );
     TQApplication &operator=( const TQApplication & );
 #endif
diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h
index 878b2f75..aa2968bc 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -101,7 +101,7 @@ public:
 };
 
 class Q_EXPORT TQDataPump : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
     int interval;
     TQTimer timer;
     TQDataSource* source;
diff --git a/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h
index f61005d9..9675b885 100644
--- a/src/kernel/ntqclipboard.h
+++ b/src/kernel/ntqclipboard.h
@@ -52,7 +52,7 @@ class TQMimeSource;
 
 class Q_EXPORT TQClipboard : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 private:
     TQClipboard( TQObject *parent=0, const char *name=0 );
     ~TQClipboard();
@@ -123,7 +123,7 @@ private:
 #endif
 
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQClipboard( const TQClipboard & );
     TQClipboard &operator=( const TQClipboard & );
 #endif
diff --git a/src/kernel/ntqconnection.h b/src/kernel/ntqconnection.h
index db562210..e505fcd7 100644
--- a/src/kernel/ntqconnection.h
+++ b/src/kernel/ntqconnection.h
@@ -67,7 +67,7 @@ private:
     int	     nargs;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQConnection( const TQConnection & );
     TQConnection &operator=( const TQConnection & );
 #endif
diff --git a/src/kernel/ntqdesktopwidget.h b/src/kernel/ntqdesktopwidget.h
index cf24fe6c..9fd40045 100644
--- a/src/kernel/ntqdesktopwidget.h
+++ b/src/kernel/ntqdesktopwidget.h
@@ -48,7 +48,7 @@ class TQDesktopWidgetPrivate; /* Don't touch! */
 
 class Q_EXPORT TQDesktopWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDesktopWidget();
     ~TQDesktopWidget();
@@ -89,7 +89,7 @@ protected:
 private:
     TQDesktopWidgetPrivate *d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDesktopWidget( const TQDesktopWidget & );
     TQDesktopWidget &operator=( const TQDesktopWidget & );
 #endif
diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h
index 303ceb99..a960d978 100644
--- a/src/kernel/ntqdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -55,7 +55,7 @@ class TQImageDragData;
 #ifndef QT_NO_MIME
 
 class Q_EXPORT TQDragObject: public TQObject, public TQMimeSource {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDragObject( TQWidget * dragSource = 0, const char * name = 0 );
     virtual ~TQDragObject();
@@ -86,14 +86,14 @@ protected:
 
 private:
     TQDragObjectData * d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDragObject( const TQDragObject & );
     TQDragObject &operator=( const TQDragObject & );
 #endif
 };
 
 class Q_EXPORT TQStoredDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQStoredDragData * d;
 
 public:
@@ -107,14 +107,14 @@ public:
     virtual TQByteArray encodedData(const char*) const;
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQStoredDrag( const TQStoredDrag & );
     TQStoredDrag &operator=( const TQStoredDrag & );
 #endif
 };
 
 class Q_EXPORT TQTextDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQTextDragPrivate* d;
 public:
     TQTextDrag( const TQString &,
@@ -133,14 +133,14 @@ public:
     static bool decode( const TQMimeSource* e, TQString& s, TQCString& subtype );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextDrag( const TQTextDrag & );
     TQTextDrag &operator=( const TQTextDrag & );
 #endif
 };
 
 class Q_EXPORT TQImageDrag: public TQDragObject {
-    Q_OBJECT
+    TQ_OBJECT
     TQImage img;
     TQStrList ofmts;
     TQImageDragData* d;
@@ -160,7 +160,7 @@ public:
     static bool decode( const TQMimeSource* e, TQPixmap& i );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQImageDrag( const TQImageDrag & );
     TQImageDrag &operator=( const TQImageDrag & );
 #endif
@@ -168,7 +168,7 @@ private:
 
 
 class Q_EXPORT TQUriDrag: public TQStoredDrag {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQUriDrag( TQStrList uris, TQWidget * dragSource = 0, const char * name = 0 );
@@ -190,7 +190,7 @@ public:
     static bool decodeLocalFiles( const TQMimeSource* e, TQStringList& i );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQUriDrag( const TQUriDrag & );
     TQUriDrag &operator=( const TQUriDrag & );
 #endif
@@ -198,7 +198,7 @@ private:
 
 class Q_EXPORT TQColorDrag : public TQStoredDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQColor color;
 
 public:
@@ -210,7 +210,7 @@ public:
     static bool decode( TQMimeSource *, TQColor &col );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQColorDrag( const TQColorDrag & );
     TQColorDrag &operator=( const TQColorDrag & );
 #endif
@@ -228,7 +228,7 @@ typedef TQUriDrag TQUrlDrag;
 //
 
 class Q_EXPORT TQDragManager: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 private:
     TQDragManager();
@@ -266,7 +266,7 @@ private:
 
     TQPixmap *pm_cursor;
     int n_cursor;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDragManager( const TQDragManager & );
     TQDragManager &operator=( const TQDragManager & );
 #endif
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h
index 2a98a33e..9685159c 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -59,7 +59,7 @@ class TQMutex;
 
 class Q_EXPORT TQEventLoop : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQEventLoop( TQObject *parent = 0, const char *name = 0 );
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index d7bbcbee..f4fb7d78 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -82,9 +82,9 @@
 #  define Q_PLUGIN_VERIFICATION_DATA \
 	static const char *qt_ucm_verification_data =			\
             "pattern=""QT_UCM_VERIFICATION_DATA""\n"			\
-            "version="QT_VERSION_STR"\n"				\
+            "version="TQT_VERSION_STR"\n"				\
             "flags="Q_PLUGIN_FLAGS_STRING"\n"				\
-	    "buildkey="QT_BUILD_KEY"\0";
+	    "buildkey="TQT_BUILD_KEY"\0";
 #endif // Q_PLUGIN_VERIFICATION_DATA
 
 #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION )	\
@@ -112,7 +112,7 @@ struct TQUnknownInterface;
 
 class Q_EXPORT TQGPlugin : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGPlugin( TQUnknownInterface *i );
     ~TQGPlugin();
diff --git a/src/kernel/ntqguardedptr.h b/src/kernel/ntqguardedptr.h
index 21a4d154..3d1fe481 100644
--- a/src/kernel/ntqguardedptr.h
+++ b/src/kernel/ntqguardedptr.h
@@ -48,7 +48,7 @@
 // ### 4.0: rename to something without Private in it. Not really internal.
 class Q_EXPORT TQGuardedPtrPrivate : public TQObject, public TQShared
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGuardedPtrPrivate( TQObject* );
     ~TQGuardedPtrPrivate();
@@ -61,7 +61,7 @@ private slots:
 
 private:
     TQObject* obj;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQGuardedPtrPrivate( const TQGuardedPtrPrivate & );
     TQGuardedPtrPrivate &operator=( const TQGuardedPtrPrivate & );
 #endif
diff --git a/src/kernel/ntqiconset.h b/src/kernel/ntqiconset.h
index 7ecbfa52..a16d9655 100644
--- a/src/kernel/ntqiconset.h
+++ b/src/kernel/ntqiconset.h
@@ -116,7 +116,7 @@ public:
     static void installDefaultFactory( TQIconFactory *factory );
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIconFactory( const TQIconFactory & );
     TQIconFactory &operator=( const TQIconFactory & );
 #endif
diff --git a/src/kernel/ntqimage.h b/src/kernel/ntqimage.h
index 34b585b7..e4f23596 100644
--- a/src/kernel/ntqimage.h
+++ b/src/kernel/ntqimage.h
@@ -326,7 +326,7 @@ private:
     TQImageIOData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQImageIO( const TQImageIO & );
     TQImageIO &operator=( const TQImageIO & );
 #endif
diff --git a/src/kernel/ntqimageformatplugin.h b/src/kernel/ntqimageformatplugin.h
index db9fb380..74ec7c2e 100644
--- a/src/kernel/ntqimageformatplugin.h
+++ b/src/kernel/ntqimageformatplugin.h
@@ -50,7 +50,7 @@ class TQImageFormatPluginPrivate;
 
 class Q_EXPORT TQImageFormatPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQImageFormatPlugin();
     ~TQImageFormatPlugin();
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index cc3eafae..4eaddb8e 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -43,7 +43,7 @@
 #include "ntqglobal.h"
 #include "ntqevent.h"
 #include "ntqstring.h"
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #include "ntqlist.h"
 #include "ntqaction.h"
 #else
@@ -62,7 +62,7 @@ struct TQInputContextMenu {
 	NoSeparator,
 	InsertSeparator
     };
-#if !(QT_VERSION-0 >= 0x040000)
+#if !(TQT_VERSION-0 >= 0x040000)
     TQString title;
     TQPopupMenu *popup;
 #endif
@@ -71,7 +71,7 @@ struct TQInputContextMenu {
 
 class TQInputContext : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQInputContext( TQObject *parent = 0 );
     virtual ~TQInputContext();
@@ -94,7 +94,7 @@ public:
     virtual bool isComposing() const;
     virtual bool isPreeditRelocationEnabled();
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
     virtual TQList actions();
     void addActionsTo( TQMenu *menu, TQInputContextMenu::Action action = TQInputContextMenu::InsertSeparator );
 #else
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index c461724a..2405a7f1 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -52,7 +52,7 @@
 #ifndef QT_NO_LAYOUT
 
 #if 0
-Q_OBJECT
+TQ_OBJECT
 #endif
 
 static const int TQLAYOUTSIZE_MAX = INT_MAX/256/16;
@@ -178,7 +178,7 @@ private:
 
 class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ResizeMode )
     Q_PROPERTY( int margin READ margin WRITE setMargin )
     Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
@@ -275,7 +275,7 @@ private:
 #endif
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLayout( const TQLayout & );
     TQLayout &operator=( const TQLayout & );
 #endif
@@ -290,7 +290,7 @@ inline void TQLayoutIterator::deleteCurrent()
 
 class Q_EXPORT TQGridLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGridLayout( TQWidget *parent, int nRows = 1, int nCols = 1, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -353,7 +353,7 @@ protected:
     void add( TQLayoutItem*, int row, int col );
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGridLayout( const TQGridLayout & );
     TQGridLayout &operator=( const TQGridLayout & );
 #endif
@@ -367,7 +367,7 @@ class TQDockWindow;
 
 class Q_EXPORT TQBoxLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop,
 		     Down = TopToBottom, Up = BottomToTop };
@@ -419,7 +419,7 @@ protected:
 
 private:
     friend class TQDockWindow;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQBoxLayout( const TQBoxLayout & );
     TQBoxLayout &operator=( const TQBoxLayout & );
 #endif
@@ -433,7 +433,7 @@ private:
 
 class Q_EXPORT TQHBoxLayout : public TQBoxLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -444,7 +444,7 @@ public:
     ~TQHBoxLayout();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHBoxLayout( const TQHBoxLayout & );
     TQHBoxLayout &operator=( const TQHBoxLayout & );
 #endif
@@ -452,7 +452,7 @@ private:	// Disabled copy constructor and operator=
 
 class Q_EXPORT TQVBoxLayout : public TQBoxLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVBoxLayout( TQWidget *parent, int border = 0,
 		 int spacing = -1, const char *name = 0 );
@@ -463,7 +463,7 @@ public:
     ~TQVBoxLayout();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVBoxLayout( const TQVBoxLayout & );
     TQVBoxLayout &operator=( const TQVBoxLayout & );
 #endif
diff --git a/src/kernel/ntqlocalfs.h b/src/kernel/ntqlocalfs.h
index ac1d6c18..72c63590 100644
--- a/src/kernel/ntqlocalfs.h
+++ b/src/kernel/ntqlocalfs.h
@@ -50,7 +50,7 @@
 
 class Q_EXPORT TQLocalFs : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQLocalFs();
diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h
index e269024b..c8289a1d 100644
--- a/src/kernel/ntqmetaobject.h
+++ b/src/kernel/ntqmetaobject.h
@@ -251,7 +251,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMetaObject( const TQMetaObject & );
     TQMetaObject &operator=( const TQMetaObject & );
 #endif
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index 28e431eb..7ab9327a 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -82,7 +82,7 @@ typedef TQDict< TQNetworkProtocolFactoryBase > TQNetworkProtocolDict;
 
 class Q_EXPORT TQNetworkProtocol : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum State {
@@ -188,7 +188,7 @@ private slots:
     void removeMe();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQNetworkProtocol( const TQNetworkProtocol & );
     TQNetworkProtocol &operator=( const TQNetworkProtocol & );
 #endif
@@ -198,7 +198,7 @@ class TQNetworkOperationPrivate;
 
 class Q_EXPORT TQNetworkOperation : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQUrlOperator;
 
 public:
@@ -233,7 +233,7 @@ private:
     TQNetworkOperationPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQNetworkOperation( const TQNetworkOperation & );
     TQNetworkOperation &operator=( const TQNetworkOperation & );
 #endif
diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h
index 804e6f1a..dc4ef21a 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/ntqobject.h
@@ -65,7 +65,7 @@ struct TQUObject;
 
 class Q_EXPORT TQObject: public TQt
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQCString name READ name WRITE setName )
 
 public:
@@ -213,7 +213,7 @@ private:
     friend class TQSignal;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQObject( const TQObject & );
     TQObject &operator=( const TQObject & );
 #endif
diff --git a/src/kernel/ntqobjectcleanuphandler.h b/src/kernel/ntqobjectcleanuphandler.h
index 464fd7bf..74f4dae8 100644
--- a/src/kernel/ntqobjectcleanuphandler.h
+++ b/src/kernel/ntqobjectcleanuphandler.h
@@ -47,7 +47,7 @@ class TQObjectList;
 
 class Q_EXPORT TQObjectCleanupHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQObjectCleanupHandler();
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index 3b4b71e1..d9b18722 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -49,17 +49,17 @@
 #ifndef QT_NO_TRANSLATION
 # ifndef QT_NO_TEXTCODEC
 // full set of tr functions
-#  define QT_TR_FUNCTIONS \
+#  define TQT_TR_FUNCTIONS \
     static TQString tr( const char *, const char * = 0 ); \
     static TQString trUtf8( const char *, const char * = 0 );
 # else
 // no TQTextCodec, no utf8
-#  define QT_TR_FUNCTIONS \
+#  define TQT_TR_FUNCTIONS \
     static TQString tr( const char *, const char * = 0 );
 # endif
 #else
 // inherit the ones from TQObject
-# define QT_TR_FUNCTIONS
+# define TQT_TR_FUNCTIONS
 #endif
 
 #ifndef QT_NO_PROPERTIES
@@ -82,10 +82,10 @@ struct TQUObject;
 #define Q_OVERRIDE( text )	    Q_OVERRIDE( text )
 #define Q_ENUMS( x )		    Q_ENUMS( x )
 #define Q_SETS( x )		    Q_SETS( x )
- /* tmake ignore Q_OBJECT */
-#define Q_OBJECT		    Q_OBJECT
- /* tmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE		    Q_OBJECT_FAKE
+ /* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT		    TQ_OBJECT
+ /* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT_FAKE		    TQ_OBJECT_FAKE
 
 #else
 #define slots					// slots: in class
@@ -99,8 +99,8 @@ struct TQUObject;
 #define Q_ENUMS( x )
 #define Q_SETS( x )
 
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT							\
+/* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT							\
 public:									\
     virtual TQMetaObject *metaObject() const { 				\
          return staticMetaObject();					\
@@ -112,12 +112,12 @@ public:									\
     QT_PROP_FUNCTIONS							\
     static TQMetaObject* staticMetaObject();				\
     TQObject* qObject() { return (TQObject*)this; } 			\
-    QT_TR_FUNCTIONS							\
+    TQT_TR_FUNCTIONS							\
 private:								\
     static TQMetaObject *metaObj;
 
-/* tmake ignore Q_OBJECT */
-#define Q_OBJECT_FAKE Q_OBJECT
+/* tmake ignore TQ_OBJECT */
+#define TQ_OBJECT_FAKE TQ_OBJECT
 
 #endif
 
diff --git a/src/kernel/ntqobjectlist.h b/src/kernel/ntqobjectlist.h
index c1d8f798..429be7bd 100644
--- a/src/kernel/ntqobjectlist.h
+++ b/src/kernel/ntqobjectlist.h
@@ -73,7 +73,7 @@ public:
 		 TQPtrListIterator::operator=( i ); }
 };
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
 #warning "remove the TQObjectListIt class"
 #warning "remove the typedef too, maybe"
diff --git a/src/kernel/ntqpaintdevice.h b/src/kernel/ntqpaintdevice.h
index 771aff49..8b54afb4 100644
--- a/src/kernel/ntqpaintdevice.h
+++ b/src/kernel/ntqpaintdevice.h
@@ -284,7 +284,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPaintDevice( const TQPaintDevice & );
     TQPaintDevice &operator=( const TQPaintDevice & );
 #endif
diff --git a/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h
index bcccdb59..a86dea4f 100644
--- a/src/kernel/ntqpainter.h
+++ b/src/kernel/ntqpainter.h
@@ -427,7 +427,7 @@ protected:
     friend class TQPrinter;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPainter( const TQPainter & );
     TQPainter &operator=( const TQPainter & );
 #endif
diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h
index fa7b9caa..a72d3d9c 100644
--- a/src/kernel/ntqprinter.h
+++ b/src/kernel/ntqprinter.h
@@ -223,7 +223,7 @@ private:
     TQPrinterPrivate *d;
 
 private:        // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPrinter( const TQPrinter & );
     TQPrinter &operator=( const TQPrinter & );
 #endif
diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h
index e9a77e3e..2e76223d 100644
--- a/src/kernel/ntqprocess.h
+++ b/src/kernel/ntqprocess.h
@@ -55,7 +55,7 @@ class TQMembuf;
 
 class Q_EXPORT TQProcess : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQProcess( TQObject *parent=0, const char *name=0 );
     TQProcess( const TQString& arg0, TQObject *parent=0, const char *name=0 );
@@ -167,7 +167,7 @@ private:
     friend class TQProc;
 #endif
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQProcess( const TQProcess & );
     TQProcess &operator=( const TQProcess & );
 #endif
diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h
index 6a435c3a..d203f951 100644
--- a/src/kernel/ntqsessionmanager.h
+++ b/src/kernel/ntqsessionmanager.h
@@ -53,7 +53,7 @@ class TQSessionManagerData;
 
 class Q_EXPORT  TQSessionManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQSessionManager( TQApplication *app, TQString &id, TQString &key );
     ~TQSessionManager();
 public:
diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h
index 0664fe5d..281b2278 100644
--- a/src/kernel/ntqsignal.h
+++ b/src/kernel/ntqsignal.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQSignal : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQSignal( TQObject *parent=0, const char *name=0 );
@@ -84,7 +84,7 @@ private:
     TQVariant val;
 #endif
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSignal( const TQSignal & );
     TQSignal &operator=( const TQSignal & );
 #endif
diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/ntqsignalmapper.h
index 2b560a7c..a7dc9aad 100644
--- a/src/kernel/ntqsignalmapper.h
+++ b/src/kernel/ntqsignalmapper.h
@@ -50,7 +50,7 @@ struct TQSignalMapperRec;
 
 
 class Q_EXPORT TQSignalMapper : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSignalMapper( TQObject* parent, const char* name=0 );
     ~TQSignalMapper();
diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h
index e8b479a8..928dbb85 100644
--- a/src/kernel/ntqsimplerichtext.h
+++ b/src/kernel/ntqsimplerichtext.h
@@ -93,7 +93,7 @@ private:
     TQSimpleRichTextData* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSimpleRichText( const TQSimpleRichText & );
     TQSimpleRichText &operator=( const TQSimpleRichText & );
 #endif
diff --git a/src/kernel/ntqsizegrip.h b/src/kernel/ntqsizegrip.h
index 20fab72e..c55e9b76 100644
--- a/src/kernel/ntqsizegrip.h
+++ b/src/kernel/ntqsizegrip.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQSizeGrip: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSizeGrip( TQWidget* parent, const char* name=0 );
     ~TQSizeGrip();
diff --git a/src/kernel/ntqsocketnotifier.h b/src/kernel/ntqsocketnotifier.h
index df92ce8e..ec42bd19 100644
--- a/src/kernel/ntqsocketnotifier.h
+++ b/src/kernel/ntqsocketnotifier.h
@@ -48,7 +48,7 @@
 
 class Q_EXPORT TQSocketNotifier : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Type { Read, Write, Exception };
 
@@ -73,7 +73,7 @@ private:
     bool	 snenabled;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocketNotifier( const TQSocketNotifier & );
     TQSocketNotifier &operator=( const TQSocketNotifier & );
 #endif
diff --git a/src/kernel/ntqsound.h b/src/kernel/ntqsound.h
index 3e4efda5..36e84b5c 100644
--- a/src/kernel/ntqsound.h
+++ b/src/kernel/ntqsound.h
@@ -49,7 +49,7 @@
 class TQSoundData;
 
 class Q_EXPORT TQSound : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static bool isAvailable();
     static void play(const TQString& filename);
@@ -102,7 +102,7 @@ public:
 };
 
 class Q_EXPORT TQAuServer : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQAuServer(TQObject* parent, const char* name);
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index f36ad8a2..0cacb8b2 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -123,7 +123,7 @@ class TQStyleHintReturn; // not defined yet
 
 class Q_EXPORT TQStyle: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQStyle();
@@ -748,7 +748,7 @@ public:
 private:
     TQStylePrivate * d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStyle( const TQStyle & );
     TQStyle& operator=( const TQStyle & );
 #endif
diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h
index b73d6f0a..7e13ad2f 100644
--- a/src/kernel/ntqstylesheet.h
+++ b/src/kernel/ntqstylesheet.h
@@ -207,7 +207,7 @@ class TQTextCustomItem;
 
 class Q_EXPORT TQStyleSheet : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQStyleSheet( TQObject *parent=0, const char *name=0 );
     virtual ~TQStyleSheet();
@@ -242,7 +242,7 @@ private:
     TQDict styles;
     TQStyleSheetItem* nullstyle;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStyleSheet( const TQStyleSheet & );
     TQStyleSheet &operator=( const TQStyleSheet & );
 #endif
diff --git a/src/kernel/ntqthread.h b/src/kernel/ntqthread.h
index 56480a3f..c3679fbc 100644
--- a/src/kernel/ntqthread.h
+++ b/src/kernel/ntqthread.h
@@ -119,10 +119,10 @@ private:
     TQThreadInstance * d;
     friend class TQThreadInstance;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQThread( const TQThread & );
     TQThread &operator=( const TQThread & );
-#endif // Q_DISABLE_COPY
+#endif // TQ_DISABLE_COPY
 };
 
 #endif // QT_THREAD_SUPPORT
diff --git a/src/kernel/ntqtimer.h b/src/kernel/ntqtimer.h
index 103c65ab..7496a22c 100644
--- a/src/kernel/ntqtimer.h
+++ b/src/kernel/ntqtimer.h
@@ -48,7 +48,7 @@
 
 class Q_EXPORT TQTimer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTimer( TQObject *parent=0, const char *name=0 );
    ~TQTimer();
@@ -75,7 +75,7 @@ private:
     uint nulltimer : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTimer( const TQTimer & );
     TQTimer &operator=( const TQTimer & );
 #endif
diff --git a/src/kernel/ntqtranslator.h b/src/kernel/ntqtranslator.h
index eccc8e4c..bbbda7ee 100644
--- a/src/kernel/ntqtranslator.h
+++ b/src/kernel/ntqtranslator.h
@@ -104,7 +104,7 @@ private:
 
 class Q_EXPORT TQTranslator: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTranslator( TQObject * parent = 0, const char * name = 0 );
     ~TQTranslator();
@@ -152,7 +152,7 @@ public:
     bool isEmpty() const;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTranslator( const TQTranslator & );
     TQTranslator &operator=( const TQTranslator & );
 #endif
diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/ntqurlinfo.h
index 18ef71c5..c1c756dc 100644
--- a/src/kernel/ntqurlinfo.h
+++ b/src/kernel/ntqurlinfo.h
@@ -64,7 +64,7 @@ public:
     TQUrlInfo();
     TQUrlInfo( const TQUrlOperator &path, const TQString &file );
     TQUrlInfo( const TQUrlInfo &ui );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::TQUrlInfo() should accept TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQUrlInfo( const TQString &name, int permissions, const TQString &owner,
@@ -94,7 +94,7 @@ public:
     virtual void setSymLink( bool b );
     virtual void setOwner( const TQString &s );
     virtual void setGroup( const TQString &s );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::setSize() should accept TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     virtual void setSize( TQIODevice::Offset size );
@@ -112,7 +112,7 @@ public:
     int permissions() const;
     TQString owner() const;
     TQString group() const;
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQUrlInfo::size() should return TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQIODevice::Offset size() const;
diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h
index 654cc313..1c1acf26 100644
--- a/src/kernel/ntqurloperator.h
+++ b/src/kernel/ntqurloperator.h
@@ -58,7 +58,7 @@ class Q_EXPORT TQUrlOperator : public TQObject, public TQUrl
 {
     friend class TQNetworkProtocol;
 
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQUrlOperator();
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index 8a5bcf77..4a5672ea 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -66,7 +66,7 @@ class TQStyle;
 
 class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
     Q_PROPERTY( bool isTopLevel READ isTopLevel )
     Q_PROPERTY( bool isDialog READ isDialog )
@@ -746,7 +746,7 @@ private:
     friend class TQLayout;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidget( const TQWidget & );
     TQWidget &operator=( const TQWidget & );
 #endif
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index bbc31757..3ad58fec 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -180,7 +180,7 @@ const TQCOORD TQCOORD_MIN = -TQCOORD_MAX - 1;
 
 typedef unsigned int TQRgb;			// RGB triplet
 
-Q_EXPORT const char *qAppName();		// get application name
+Q_EXPORT const char *tqAppName();		// get application name
 
 // Misc functions
 
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 019dd836..5e34f6ce 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -802,7 +802,7 @@ bool TQAccel::connectItem( int id, const TQObject *receiver, const char *member
     if ( item ) {
 	if ( !item->signal ) {
 	    item->signal = new TQSignal;
-	    Q_CHECK_PTR( item->signal );
+	    TQ_CHECK_PTR( item->signal );
 	}
 	return item->signal->connect( receiver, member );
     }
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp
index e89cf2c0..fdf7e93b 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/qaccessible.cpp
@@ -294,7 +294,7 @@ static TQPluginManager *qAccessibleManager = 0;
 
 class AccessibleCache : public TQObject, public TQPtrDict
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AccessibleCache()
         : TQPtrDict(73)
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 6eb69ff4..c15f19ab 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -481,7 +481,7 @@ Q_EXPORT void qAddPostRoutine( TQtCleanUpFunction p)
 {
     if ( !postRList ) {
 	postRList = new TQVFuncList;
-	Q_CHECK_PTR( postRList );
+	TQ_CHECK_PTR( postRList );
     }
     postRList->prepend( p );
 }
@@ -1878,7 +1878,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
     if ( !className ) {
 	if ( !app_pal ) {
 	    app_pal = new TQPalette( pal );
-	    Q_CHECK_PTR( app_pal );
+	    TQ_CHECK_PTR( app_pal );
 	} else {
 	    *app_pal = pal;
 	}
@@ -1889,7 +1889,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
     } else {
 	if ( !app_palettes ) {
 	    app_palettes = new TQAsciiDict;
-	    Q_CHECK_PTR( app_palettes );
+	    TQ_CHECK_PTR( app_palettes );
 	    app_palettes->setAutoDelete( TRUE );
 	}
 	oldpal = app_palettes->find( className );
@@ -1934,7 +1934,7 @@ TQFont TQApplication::font( const TQWidget *w )
     }
     if ( !app_font ) {
 	app_font = new TQFont( "Helvetica" );
-	Q_CHECK_PTR( app_font );
+	TQ_CHECK_PTR( app_font );
     }
     return *app_font;
 }
@@ -1964,7 +1964,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets,
 	qt_app_has_font = TRUE;
 	if ( !app_font ) {
 	    app_font = new TQFont( font );
-	    Q_CHECK_PTR( app_font );
+	    TQ_CHECK_PTR( app_font );
 	} else {
 	    *app_font = font;
 	}
@@ -1979,11 +1979,11 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets,
     } else {
 	if (!app_fonts){
 	    app_fonts = new TQAsciiDict;
-	    Q_CHECK_PTR( app_fonts );
+	    TQ_CHECK_PTR( app_fonts );
 	    app_fonts->setAutoDelete( TRUE );
 	}
 	TQFont* fnt = new TQFont(font);
-	Q_CHECK_PTR( fnt );
+	TQ_CHECK_PTR( fnt );
 	app_fonts->insert(className, fnt);
     }
     if ( informWidgets && is_app_running && !is_app_closing ) {
@@ -3110,7 +3110,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event )
 
     if ( !globalPostedEvents ) {			// create list
 	globalPostedEvents = new TQPostEventList;
-	Q_CHECK_PTR( globalPostedEvents );
+	TQ_CHECK_PTR( globalPostedEvents );
 	globalPostedEvents->setAutoDelete( TRUE );
 	qapp_cleanup_events.set( &globalPostedEvents );
     }
@@ -3757,7 +3757,7 @@ TQDesktopWidget *TQApplication::desktop()
     if ( !qt_desktopWidget || // not created yet
 	 !qt_desktopWidget->isDesktop() ) { // reparented away
 	qt_desktopWidget = new TQDesktopWidget();
-	Q_CHECK_PTR( qt_desktopWidget );
+	TQ_CHECK_PTR( qt_desktopWidget );
     }
     return qt_desktopWidget;
 }
@@ -3770,7 +3770,7 @@ TQClipboard *TQApplication::clipboard()
 {
     if ( qt_clipboard == 0 ) {
 	qt_clipboard = new TQClipboard;
-	Q_CHECK_PTR( qt_clipboard );
+	TQ_CHECK_PTR( qt_clipboard );
     }
     return qt_clipboard;
 }
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 1c285c44..4579b98f 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -1019,7 +1019,7 @@ bool TQApplication::x11_apply_settings()
 
     // read library (ie. plugin) path list
     TQString libpathkey =
-	TQString("/qt/%1.%2/libraryPath").arg( QT_VERSION >> 16 ).arg( (QT_VERSION & 0xff00 ) >> 8 );
+	TQString("/qt/%1.%2/libraryPath").arg( TQT_VERSION >> 16 ).arg( (TQT_VERSION & 0xff00 ) >> 8 );
     TQStringList pathlist = settings.readListEntry(libpathkey, ':');
     if (! pathlist.isEmpty()) {
 	TQStringList::ConstIterator it = pathlist.begin();
@@ -1835,13 +1835,13 @@ void qt_init_internal( int *argcptr, char **argv,
 	TQPaintDevice::x_appdefcolormap_arr = new bool[ appScreenCount ];
 	TQPaintDevice::x_appvisual_arr = new void*[ appScreenCount ];
 	TQPaintDevice::x_appdefvisual_arr = new bool[ appScreenCount ];
-	Q_CHECK_PTR( TQPaintDevice::x_appdepth_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appcells_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_approotwindow_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appcolormap_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appdefcolormap_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appvisual_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appdefvisual_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdepth_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appcells_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_approotwindow_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appcolormap_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdefcolormap_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appvisual_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdefvisual_arr );
 
 	int screen;
 	TQString serverVendor( ServerVendor( appDpy) );
@@ -2384,8 +2384,8 @@ void qt_init_internal( int *argcptr, char **argv,
 
 		// read library (ie. plugin) path list
 		TQString libpathkey = TQString("/qt/%1.%2/libraryPath")
-				     .arg( QT_VERSION >> 16 )
-				     .arg( (QT_VERSION & 0xff00 ) >> 8 );
+				     .arg( TQT_VERSION >> 16 )
+				     .arg( (TQT_VERSION & 0xff00 ) >> 8 );
 		TQStringList pathlist =
 		    settings.readListEntry(libpathkey, ':');
 		if (! pathlist.isEmpty()) {
@@ -2618,7 +2618,7 @@ bool qt_wstate_iconified( WId winid )
     return iconic;
 }
 
-const char *qAppName()				// get application name
+const char *tqAppName()				// get application name
 {
     return appName;
 }
@@ -2873,11 +2873,11 @@ void TQApplication::setOverrideCursor( const TQCursor &cursor, bool replace )
 {
     if ( !cursorStack ) {
 	cursorStack = new TQCursorList;
-	Q_CHECK_PTR( cursorStack );
+	TQ_CHECK_PTR( cursorStack );
 	cursorStack->setAutoDelete( TRUE );
     }
     app_cursor = new TQCursor( cursor );
-    Q_CHECK_PTR( app_cursor );
+    TQ_CHECK_PTR( app_cursor );
     if ( replace )
 	cursorStack->removeLast();
     cursorStack->append( app_cursor );
@@ -3176,7 +3176,7 @@ void qPRCreate( const TQWidget *widget, Window oldwin )
 {						// TQWidget::reparent mechanism
     if ( !wPRmapper ) {
 	wPRmapper = new TQWidgetIntDict;
-	Q_CHECK_PTR( wPRmapper );
+	TQ_CHECK_PTR( wPRmapper );
     }
     wPRmapper->insert( (long)oldwin, widget );	// add old window to mapper
     TQETWidget *w = (TQETWidget *)widget;
@@ -3846,7 +3846,7 @@ void qt_enter_modal( TQWidget *widget )
 {
     if ( !qt_modal_stack ) {			// create modal stack
 	qt_modal_stack = new TQWidgetList;
-	Q_CHECK_PTR( qt_modal_stack );
+	TQ_CHECK_PTR( qt_modal_stack );
     }
     if (widget->parentWidget()) {
 	TQEvent e(TQEvent::WindowBlocked);
@@ -3941,7 +3941,7 @@ void TQApplication::openPopup( TQWidget *popup )
     openPopupCount++;
     if ( !popupWidgets ) {			// create list
 	popupWidgets = new TQWidgetList;
-	Q_CHECK_PTR( popupWidgets );
+	TQ_CHECK_PTR( popupWidgets );
     }
     popupWidgets->append( popup );		// add to end of list
 
@@ -6223,7 +6223,7 @@ public:
 
 class TQSmSocketReceiver : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSmSocketReceiver( int socket )
 	: TQObject(0,0)
@@ -6375,8 +6375,8 @@ static void sm_performSaveYourself( TQSessionManagerData* smd )
     // generate a restart and discard command that makes sense
     TQStringList restart;
     restart  << qApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey;
-    if (qstricmp(qAppName(), qAppClass()) != 0)
-	restart << "-name" << qAppName();
+    if (qstricmp(tqAppName(), qAppClass()) != 0)
+	restart << "-name" << tqAppName();
     sm->setRestartCommand( restart );
     TQStringList discard;
     sm->setDiscardCommand( discard );
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index 41164a4c..21485fd1 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -346,7 +346,7 @@ TQImageDecoder::TQImageDecoder(TQImageConsumer* c)
 {
     qt_init_image_handlers();
     d = new TQImageDecoderPrivate;
-    Q_CHECK_PTR(d);
+    TQ_CHECK_PTR(d);
     consumer = c;
     actual_decoder = 0;
 }
@@ -1138,7 +1138,7 @@ int TQGIFFormat::decode(TQImage& img, TQImageConsumer* consumer,
 	    if (count<11) hold[count]=ch;
 	    count++;
 	    if (count==hold[0]+1) {
-		if (qstrncmp((char*)(hold+1), "NETSCAPE", 8)==0) {
+		if (tqstrncmp((char*)(hold+1), "NETSCAPE", 8)==0) {
 		    // Looping extension
 		    state=NetscapeExtensionBlockSize;
 		} else {
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 379e8249..8f602d84 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -238,7 +238,7 @@ static TQClipboardData *clipboardData()
 {
     if ( internalCbData == 0 ) {
 	internalCbData = new TQClipboardData;
-	Q_CHECK_PTR( internalCbData );
+	TQ_CHECK_PTR( internalCbData );
 	qAddPostRoutine( cleanupClipboardData );
     }
     return internalCbData;
@@ -260,7 +260,7 @@ static TQClipboardData *selectionData()
 {
     if (internalSelData == 0) {
 	internalSelData = new TQClipboardData;
-	Q_CHECK_PTR(internalSelData);
+	TQ_CHECK_PTR(internalSelData);
 	qAddPostRoutine(cleanupSelectionData);
     }
     return internalSelData;
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 38080b42..4328babc 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -242,12 +242,12 @@ void TQColor::initialize()
 	    // we allocated.
 	    screendata[scr]->g_cells = TQMIN(ncols,256);
 	    screendata[scr]->g_carr  = new XColor[screendata[scr]->g_cells];
-	    Q_CHECK_PTR( screendata[scr]->g_carr );
+	    TQ_CHECK_PTR( screendata[scr]->g_carr );
 	    memset( screendata[scr]->g_carr, 0,
 		    screendata[scr]->g_cells*sizeof(XColor) );
 	    screendata[scr]->g_carr_fetch = TRUE;	// run XQueryColors on demand
 	    screendata[scr]->g_our_alloc = new bool[screendata[scr]->g_cells];
-	    Q_CHECK_PTR( screendata[scr]->g_our_alloc );
+	    TQ_CHECK_PTR( screendata[scr]->g_our_alloc );
 	    memset( screendata[scr]->g_our_alloc, FALSE,
 		    screendata[scr]->g_cells*sizeof(bool) );
 	    XColor *xc = &screendata[scr]->g_carr[0];
@@ -273,7 +273,7 @@ void TQColor::initialize()
 	    dictsize = col_std_dict;
 	}
 	screendata[scr]->colorDict = new TQColorDict(dictsize);	// create dictionary
-	Q_CHECK_PTR( screendata[scr]->colorDict );
+	TQ_CHECK_PTR( screendata[scr]->colorDict );
 
 	if ( spec == (int)TQApplication::ManyColor ) {
 	    screendata[scr]->color_reduce = TRUE;
@@ -572,7 +572,7 @@ uint TQColor::alloc( int screen )
     }
     if ( !many || current_alloc_context != 0 ) {
 	c = new TQColorData;			// insert into color dict
-	Q_CHECK_PTR( c );
+	TQ_CHECK_PTR( c );
 	c->pix	   = pix;
 	c->context = current_alloc_context;
 	sd->colorDict->insert( (long)d.argb, c );	// store color in dict
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index b880988f..56529a07 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -220,7 +220,7 @@ TQCursor::TQCursor( HANDLE cursor )
 	initialize();
 
     data = new TQCursorData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->hcurs = cursor;
 }
 
@@ -242,7 +242,7 @@ void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &mask,
 	return;
     }
     data = new TQCursorData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->bm  = new TQBitmap( bitmap );
     data->bmm = new TQBitmap( mask );
     data->hcurs = 0;
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index 96653b1c..e74847cd 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -1350,7 +1350,7 @@ void TQUriDrag::setUris( TQStrList uris )
     TQByteArray a;
     int c=0;
     for ( const char* s = uris.first(); s; s = uris.next() ) {
-	int l = qstrlen(s);
+	int l = tqstrlen(s);
 	a.resize(c+l+2);
 	memcpy(a.data()+c,s,l);
 	memcpy(a.data()+c+l,"\r\n",2);
@@ -1603,7 +1603,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri)
 	    char hostname[ 257 ];
 	    if ( gethostname( hostname, 255 ) == 0 ) {
 		hostname[ 256 ] = '\0';
-		if ( qstrncmp( uri+1, hostname, hostname_end - ( uri+1 )) == 0 ) {
+		if ( tqstrncmp( uri+1, hostname, hostname_end - ( uri+1 )) == 0 ) {
 		    uri = hostname_end + 1; // point after the slash
 		    local = TRUE;
 		}
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index b131a701..f7b829a9 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -263,12 +263,12 @@ timeval *qt_wait_timer()
 static void initTimers()			// initialize timers
 {
     timerBitVec = new TQBitArray( 128 );
-    Q_CHECK_PTR( timerBitVec );
+    TQ_CHECK_PTR( timerBitVec );
     int i = timerBitVec->size();
     while( i-- > 0 )
 	timerBitVec->clearBit( i );
     timerList = new TimerList;
-    Q_CHECK_PTR( timerList );
+    TQ_CHECK_PTR( timerList );
     timerList->setAutoDelete( TRUE );
     gettimeofday( &watchtime, 0 );
 }
@@ -293,7 +293,7 @@ int qStartTimer( int interval, TQObject *obj )
 	return 0;
     timerBitVec->setBit( id-1 );		// set timer active
     TimerInfo *t = new TimerInfo;		// create timer
-    Q_CHECK_PTR( t );
+    TQ_CHECK_PTR( t );
     t->id = id;
     t->interval.tv_sec  = interval/1000;
     t->interval.tv_usec = (interval%1000)*1000;
@@ -379,13 +379,13 @@ void TQEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
     if ( ! list ) {
 	// create new list, the TQSockNotType destructor will delete it for us
 	list = new TQPtrList;
-	Q_CHECK_PTR( list );
+	TQ_CHECK_PTR( list );
 	list->setAutoDelete( TRUE );
 	d->sn_vec[type].list = list;
     }
 
     sn = new TQSockNot;
-    Q_CHECK_PTR( sn );
+    TQ_CHECK_PTR( sn );
     sn->obj = notifier;
     sn->fd = sockfd;
     sn->queue = &d->sn_vec[type].pending_fds;
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 6e78fa43..4521e89b 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -97,7 +97,7 @@ bool TQFontDef::operator==( const TQFontDef &other ) const
     } else if (pointSize != -1 && other.pointSize != -1) {
 	if (pointSize != other.pointSize
 	    && (TQABS(pointSize - other.pointSize) >= 5
-		|| qRound(pointSize/10.) != qRound(other.pointSize/10.)))
+		|| tqRound(pointSize/10.) != tqRound(other.pointSize/10.)))
 	    return FALSE;
     } else {
 	return FALSE;
@@ -535,7 +535,7 @@ TQFontEngineData::~TQFontEngineData()
 TQFont::TQFont( TQFontPrivate *data, TQPaintDevice *pd )
 {
     d = new TQFontPrivate( *data );
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     d->paintdevice = pd;
 
     // now a single reference
@@ -604,7 +604,7 @@ TQFont::TQFont( const TQString &family, int pointSize, int weight, bool italic )
 {
 
     d = new TQFontPrivate;
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
 
     d->mask = TQFontPrivate::Family;
 
@@ -765,7 +765,7 @@ void TQFont::setPointSizeFloat( float pointSize )
 
     detach();
 
-    d->request.pointSize = qRound(pointSize * 10.0);
+    d->request.pointSize = tqRound(pointSize * 10.0);
     d->request.pixelSize = -1;
 
     d->mask |= TQFontPrivate::Size;
@@ -1403,7 +1403,7 @@ static void initFontSubst()
 	return;
 
     fontSubst = new TQFontSubst(17, FALSE);
-    Q_CHECK_PTR( fontSubst );
+    TQ_CHECK_PTR( fontSubst );
     fontSubst->setAutoDelete( TRUE );
     qfont_cleanup_fontsubst.set(&fontSubst);
 
@@ -1929,7 +1929,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p )
 #if defined(Q_WS_X11)
     if ( d->screen != p->scrn ) {
 	TQFontPrivate *new_d = new TQFontPrivate( *d );
-	Q_CHECK_PTR( new_d );
+	TQ_CHECK_PTR( new_d );
 	d = new_d;
 	d->screen = p->scrn;
 	d->count = 1;
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 82120732..4e2c6f01 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -355,7 +355,7 @@ void TQFontPrivate::load( TQFont::Script script )
 #endif // QT_CHECK_STATE
 
     TQFontDef req = request;
-    req.pixelSize = qRound(pixelSize(req, paintdevice, screen));
+    req.pixelSize = tqRound(pixelSize(req, paintdevice, screen));
     req.pointSize = 0;
 
     if ( ! engineData ) {
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index 96cc1118..1138dfef 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -1238,7 +1238,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
     if ( fp ) {
 #if defined(Q_WS_X11)
         fe->fontDef.pointSize =
-            qRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen));
+            tqRound(10. * qt_pointSize(fe->fontDef.pixelSize, fp->paintdevice, fp->screen));
 #elif defined(Q_WS_WIN)
         fe->fontDef.pointSize     = int( double( fe->fontDef.pixelSize ) * 720.0 /
                                          GetDeviceCaps(shared_dc,LOGPIXELSY) );
@@ -1726,7 +1726,7 @@ TQValueList TQFontDatabase::pointSizes( const TQString &family,
 
 		if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) {
 #ifdef Q_WS_X11
-		    const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+		    const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
 #else
 		    const uint pointSize = size->pixelSize; // embedded uses 72dpi
 #endif
@@ -1827,7 +1827,7 @@ TQValueList TQFontDatabase::smoothSizes( const TQString &family,
 
 		if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) {
 #ifdef Q_WS_X11
-		    const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+		    const uint pointSize = tqRound(qt_pointSize(size->pixelSize, 0, -1));
 #else
 		    const uint pointSize = size->pixelSize; // embedded uses 72dpi
 #endif
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index 9231bf50..c027bfc4 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -618,7 +618,7 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen )
 	fd->family +=
 	    TQString::fromLatin1(" [") + foundry + TQString::fromLatin1("]");
 
-    if ( qstrlen( tokens[AddStyle] ) > 0 )
+    if ( tqstrlen( tokens[AddStyle] ) > 0 )
 	fd->addStyle = TQString::fromLatin1(tokens[AddStyle]);
     else
 	fd->addStyle = TQString::null;
@@ -638,10 +638,10 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen )
     if ( r && fd->pixelSize && TQPaintDevice::x11AppDpiY( screen ) &&
 	 r != TQPaintDevice::x11AppDpiY( screen ) ) {
 	// calculate actual pointsize for display DPI
-	fd->pointSize = qRound(qt_pointSize(fd->pixelSize, 0, screen) * 10.);
+	fd->pointSize = tqRound(qt_pointSize(fd->pixelSize, 0, screen) * 10.);
     } else if ( fd->pixelSize == 0 && fd->pointSize ) {
 	// calculate pixel size from pointsize/dpi
-	fd->pixelSize = qRound(qt_pixelSize(fd->pointSize / 10., 0, screen));
+	fd->pixelSize = tqRound(qt_pixelSize(fd->pointSize / 10., 0, screen));
     }
 
     return TRUE;
@@ -1977,7 +1977,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef
 
             double px;
             if (XftPatternGetDouble(xft->pattern(), XFT_PIXEL_SIZE, 0, &px) == XftResultMatch)
-                xft->fontDef.pixelSize = qRound(px);
+                xft->fontDef.pixelSize = tqRound(px);
 
             int weight = XFT_WEIGHT_MEDIUM;
             XftPatternGetInteger(xft->pattern(), XFT_WEIGHT, 0, &weight);
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 290e3519..3802a13c 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -153,8 +153,8 @@ static void drawScaled(int x, int y, const TQTextEngine *engine, const TQScriptI
                        const TQWMatrix &xmat, float scale)
 {
     // font doesn't support transformations, need to do it by hand
-    int w = qRound(si->width/scale);
-    int h = qRound((si->ascent + si->descent + 1)/scale);
+    int w = tqRound(si->width/scale);
+    int h = tqRound((si->ascent + si->descent + 1)/scale);
     if (w == 0 || h == 0)
         return;
     TQWMatrix mat1 = xmat;
@@ -362,7 +362,7 @@ int TQFontEngineBox::descent() const
 
 int TQFontEngineBox::leading() const
 {
-    int l = qRound( _size * 0.15 );
+    int l = tqRound( _size * 0.15 );
     return (l > 0) ? l : 1;
 }
 
@@ -531,7 +531,7 @@ TQFontEngine::Error TQFontEngineXLFD::stringToCMap( const TQChar *str, int len,
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
     return NoError;
@@ -786,7 +786,7 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( const glyph_t *glyphs, const adva
 	    overall.y = TQMIN( overall.y, y );
 	    xmax = TQMAX( xmax, overall.xoff + offsets[i].x + xcs->rbearing );
 	    ymax = TQMAX( ymax, y + xcs->ascent + xcs->descent );
-	    overall.xoff += qRound(advances[i]/_scale);
+	    overall.xoff += tqRound(advances[i]/_scale);
 	} else {
 	    int size = _fs->ascent;
 	    overall.x = TQMIN(overall.x, overall.xoff );
@@ -800,12 +800,12 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( const glyph_t *glyphs, const adva
     overall.width = xmax - overall.x;
 
     if ( _scale != 1. ) {
-	overall.x = qRound(overall.x * _scale);
-	overall.y = qRound(overall.y * _scale);
-	overall.height = qRound(overall.height * _scale);
-	overall.width = qRound(overall.width * _scale);
-	overall.xoff = qRound(overall.xoff * _scale);
-	overall.yoff = qRound(overall.yoff * _scale);
+	overall.x = tqRound(overall.x * _scale);
+	overall.y = tqRound(overall.y * _scale);
+	overall.height = tqRound(overall.height * _scale);
+	overall.width = tqRound(overall.width * _scale);
+	overall.xoff = tqRound(overall.xoff * _scale);
+	overall.yoff = tqRound(overall.yoff * _scale);
     }
     return overall;
 }
@@ -822,12 +822,12 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( glyph_t glyph )
 	gm = glyph_metrics_t( 0, size, size, size, size, 0 );
     }
     if ( _scale != 1. ) {
-	gm.x = qRound(gm.x * _scale);
-	gm.y = qRound(gm.y * _scale);
-	gm.height = qRound(gm.height * _scale);
-	gm.width = qRound(gm.width * _scale);
-	gm.xoff = qRound(gm.xoff * _scale);
-	gm.yoff = qRound(gm.yoff * _scale);
+	gm.x = tqRound(gm.x * _scale);
+	gm.y = tqRound(gm.y * _scale);
+	gm.height = tqRound(gm.height * _scale);
+	gm.width = tqRound(gm.width * _scale);
+	gm.xoff = tqRound(gm.xoff * _scale);
+	gm.yoff = tqRound(gm.yoff * _scale);
     }
     return gm;
 }
@@ -835,24 +835,24 @@ glyph_metrics_t TQFontEngineXLFD::boundingBox( glyph_t glyph )
 
 int TQFontEngineXLFD::ascent() const
 {
-    return qRound(_fs->ascent*_scale);
+    return tqRound(_fs->ascent*_scale);
 }
 
 int TQFontEngineXLFD::descent() const
 {
-    return qRound((_fs->descent-1)*_scale);
+    return tqRound((_fs->descent-1)*_scale);
 }
 
 int TQFontEngineXLFD::leading() const
 {
-    int l = qRound((TQMIN(_fs->ascent, _fs->max_bounds.ascent)
+    int l = tqRound((TQMIN(_fs->ascent, _fs->max_bounds.ascent)
 		    + TQMIN(_fs->descent, _fs->max_bounds.descent)) * _scale * 0.15 );
     return (l > 0) ? l : 1;
 }
 
 int TQFontEngineXLFD::maxCharWidth() const
 {
-    return qRound(_fs->max_bounds.width*_scale);
+    return tqRound(_fs->max_bounds.width*_scale);
 }
 
 
@@ -888,7 +888,7 @@ int TQFontEngineXLFD::minLeftBearing() const
 	} else
 	    ((TQFontEngineXLFD *)this)->lbearing = _fs->min_bounds.lbearing;
     }
-    return qRound (lbearing*_scale);
+    return tqRound (lbearing*_scale);
 }
 
 int TQFontEngineXLFD::minRightBearing() const
@@ -916,7 +916,7 @@ int TQFontEngineXLFD::minRightBearing() const
 	} else
 	    ((TQFontEngineXLFD *)this)->rbearing = _fs->min_bounds.rbearing;
     }
-    return qRound (rbearing*_scale);
+    return tqRound (rbearing*_scale);
 }
 
 int TQFontEngineXLFD::cmap() const
@@ -1628,7 +1628,7 @@ TQFontEngine::Error TQFontEngineXft::stringToCMap( const TQChar *str, int len, g
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
 #else
@@ -1694,7 +1694,7 @@ TQFontEngine::Error TQFontEngineXft::stringToCMap( const TQChar *str, int len, g
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
 #endif // QT_XFT2
@@ -1720,7 +1720,7 @@ void TQFontEngineXft::recalcAdvances( int len, glyph_t *glyphs, advance_t *advan
 	}
 	if ( _scale != 1. ) {
 	    for ( int i = 0; i < len; i++ )
-		advances[i] = qRound(advances[i]*_scale);
+		advances[i] = tqRound(advances[i]*_scale);
 	}
     }
 #else
@@ -1737,7 +1737,7 @@ void TQFontEngineXft::recalcAdvances( int len, glyph_t *glyphs, advance_t *advan
     }
     if ( _scale != 1. ) {
 	for ( int i = 0; i < len; i++ )
-	    advances[i] = qRound(advances[i]*_scale);
+	    advances[i] = tqRound(advances[i]*_scale);
     }
 #endif // QT_XFT2
 }
@@ -2005,14 +2005,14 @@ glyph_metrics_t TQFontEngineXft::boundingBox( const glyph_t *glyphs, const advan
             overall.y = TQMIN( overall.y, y );
             xmax = TQMAX( xmax, x + xgi.width );
             ymax = TQMAX( ymax, y + xgi.height );
-            overall.xoff += qRound(advances[i]/_scale);
+            overall.xoff += tqRound(advances[i]/_scale);
         }
-	overall.x = qRound(overall.x * _scale);
-	overall.y = qRound(overall.y * _scale);
-	overall.xoff = qRound(overall.xoff * _scale);
-	overall.yoff = qRound(overall.yoff * _scale);
-	xmax = qRound(xmax * _scale);
-	ymax = qRound(ymax * _scale);
+	overall.x = tqRound(overall.x * _scale);
+	overall.y = tqRound(overall.y * _scale);
+	overall.xoff = tqRound(overall.xoff * _scale);
+	overall.yoff = tqRound(overall.yoff * _scale);
+	xmax = tqRound(xmax * _scale);
+	ymax = tqRound(ymax * _scale);
     } else {
         for (int i = 0; i < numGlyphs; i++) {
             getGlyphInfo( &xgi, _font, glyphs[i] );
@@ -2036,12 +2036,12 @@ glyph_metrics_t TQFontEngineXft::boundingBox( glyph_t glyph )
     getGlyphInfo( &xgi, _font, glyph );
     glyph_metrics_t gm = glyph_metrics_t( -xgi.x, -xgi.y, xgi.width, xgi.height, xgi.xOff, -xgi.yOff );
     if ( _scale != 1. ) {
-	gm.x = qRound(gm.x * _scale);
-	gm.y = qRound(gm.y * _scale);
-	gm.height = qRound(gm.height * _scale);
-	gm.width = qRound(gm.width * _scale);
-	gm.xoff = qRound(gm.xoff * _scale);
-	gm.yoff = qRound(gm.yoff * _scale);
+	gm.x = tqRound(gm.x * _scale);
+	gm.y = tqRound(gm.y * _scale);
+	gm.height = tqRound(gm.height * _scale);
+	gm.width = tqRound(gm.width * _scale);
+	gm.xoff = tqRound(gm.xoff * _scale);
+	gm.yoff = tqRound(gm.yoff * _scale);
     }
     return gm;
 }
@@ -2050,18 +2050,18 @@ glyph_metrics_t TQFontEngineXft::boundingBox( glyph_t glyph )
 
 int TQFontEngineXft::ascent() const
 {
-    return qRound(_font->ascent*_scale);
+    return tqRound(_font->ascent*_scale);
 }
 
 int TQFontEngineXft::descent() const
 {
-    return qRound((_font->descent-1)*_scale);
+    return tqRound((_font->descent-1)*_scale);
 }
 
 // #### use Freetype to determine this
 int TQFontEngineXft::leading() const
 {
-    int l = qRound(TQMIN( _font->height - (_font->ascent + _font->descent),
+    int l = tqRound(TQMIN( _font->height - (_font->ascent + _font->descent),
 			((_font->ascent + _font->descent) >> 4)*_scale ));
     return (l > 0) ? l : 1;
 }
@@ -2089,7 +2089,7 @@ int TQFontEngineXft::underlinePosition() const
 
 int TQFontEngineXft::maxCharWidth() const
 {
-    return qRound(_font->max_advance_width*_scale);
+    return tqRound(_font->max_advance_width*_scale);
 }
 
 static const ushort char_table[] = {
@@ -2675,15 +2675,15 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters)
             // ###### fix the case where we have y advances. How do we handle this in Uniscribe?????
             if (positions[i].new_advance) {
                 item->advances[i] = item->flags & TQTextEngine::RightToLeft
-                                    ? -qRound((positions[i].x_advance >> 6)*scale) 
-                                    :  qRound((positions[i].x_advance >> 6)*scale);
+                                    ? -tqRound((positions[i].x_advance >> 6)*scale) 
+                                    :  tqRound((positions[i].x_advance >> 6)*scale);
             } else {
                 item->advances[i] += item->flags & TQTextEngine::RightToLeft
-                                     ? -qRound((positions[i].x_advance >> 6)*scale) 
-                                     :  qRound((positions[i].x_advance >> 6)*scale);
+                                     ? -tqRound((positions[i].x_advance >> 6)*scale) 
+                                     :  tqRound((positions[i].x_advance >> 6)*scale);
             }
-	    item->offsets[i].x = qRound((positions[i].x_pos >> 6)*scale);
-	    item->offsets[i].y = -qRound((positions[i].y_pos >> 6)*scale);
+	    item->offsets[i].x = tqRound((positions[i].x_pos >> 6)*scale);
+	    item->offsets[i].y = -tqRound((positions[i].y_pos >> 6)*scale);
             int back = positions[i].back;
             if (item->flags & TQTextEngine::RightToLeft) {
                 while (back--) {
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index 56bd482e..d904b28c 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -498,11 +498,11 @@ TQImage::TQImage( uchar* yourdata, int w, int h, int depth,
     } else {
 	// calloc since we realloc, etc. later (ick)
 	data->ctbl = (TQRgb*)calloc( data->ncols*sizeof(TQRgb), data->ncols );
-        Q_CHECK_PTR(data->ctbl);
+        TQ_CHECK_PTR(data->ctbl);
 	data->ctbl_mine = TRUE;
     }
     uchar** jt = (uchar**)malloc(h*sizeof(uchar*));
-    Q_CHECK_PTR(jt);
+    TQ_CHECK_PTR(jt);
     for (int j=0; jctbl = (TQRgb*)calloc( numColors*sizeof(TQRgb), numColors );
-        Q_CHECK_PTR(data->ctbl);
+        TQ_CHECK_PTR(data->ctbl);
 	data->ctbl_mine = TRUE;
     }
     uchar** jt = (uchar**)malloc(h*sizeof(uchar*));
-    Q_CHECK_PTR(jt);
+    TQ_CHECK_PTR(jt);
     for (int j=0; jncols)*sizeof(TQRgb) );
     } else {					// create new color table
 	data->ctbl = (TQRgb*)calloc( numColors*sizeof(TQRgb), 1 );
-        Q_CHECK_PTR(data->ctbl);
+        TQ_CHECK_PTR(data->ctbl);
 	data->ctbl_mine = TRUE;
     }
     data->ncols = data->ctbl == 0 ? 0 : numColors;
@@ -1297,7 +1297,7 @@ bool TQImage::create( int width, int height, int depth, int numColors,
     int ptbl   = height*sizeof(uchar*);		// pointer table size
     int size   = nbytes + ptbl;			// total size of data block
     uchar **p  = (uchar **)malloc( size );	// alloc image bits
-    Q_CHECK_PTR(p);
+    TQ_CHECK_PTR(p);
     if ( !p ) {					// no memory
 	setNumColors( 0 );
 	return FALSE;
@@ -1336,7 +1336,7 @@ bool TQImage::create( const TQSize& size, int depth, int numColors,
 void TQImage::init()
 {
     data = new TQImageData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     reinit();
 }
 
@@ -2977,8 +2977,8 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const
     if ( mat.m12() == 0.0F && mat.m21() == 0.0F ) {
 	if ( mat.m11() == 1.0F && mat.m22() == 1.0F ) // identity matrix
 	    return copy();
-	hd = qRound( mat.m22() * hs );
-	wd = qRound( mat.m11() * ws );
+	hd = tqRound( mat.m22() * hs );
+	wd = tqRound( mat.m11() * ws );
 	hd = TQABS( hd );
 	wd = TQABS( wd );
     } else {					// rotation or shearing
@@ -3897,7 +3897,7 @@ void qt_init_image_handlers()		// initialize image handlers
 {
     if ( !imageHandlers ) {
 	imageHandlers = new TQIHList;
-	Q_CHECK_PTR( imageHandlers );
+	TQ_CHECK_PTR( imageHandlers );
 	imageHandlers->setAutoDelete( TRUE );
 	qAddPostRoutine( cleanup );
 #ifndef QT_NO_IMAGEIO_BMP
@@ -4016,7 +4016,7 @@ void TQImageIO::defineIOHandler( const char *format,
     TQImageHandler *p;
     p = new TQImageHandler( format, header, flags,
 			   readImage, writeImage );
-    Q_CHECK_PTR( p );
+    TQ_CHECK_PTR( p );
     imageHandlers->insert( 0, p );
 }
 
@@ -4765,7 +4765,7 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image )
     else if ( nbits == 4 ) {			// 4 bit BMP image
 	int    buflen = ((w+7)/8)*4;
 	uchar *buf    = new uchar[buflen];
-	Q_CHECK_PTR( buf );
+	TQ_CHECK_PTR( buf );
 	if ( comp == BMP_RLE4 ) {		// run length compression
 	    int x=0, y=0, b, c, i;
 	    register uchar *p = line[h-1];
@@ -4957,7 +4957,7 @@ static void read_bmp_image( TQImageIO *iio )
     s.setByteOrder( TQDataStream::LittleEndian );// Intel byte order
     s >> bf;					// read BMP file header
 
-    if ( qstrncmp(bf.bfType,"BM",2) != 0 )	// not a BMP image
+    if ( tqstrncmp(bf.bfType,"BM",2) != 0 )	// not a BMP image
 	return;
 
     TQImage image;
@@ -5584,11 +5584,11 @@ static void write_xbm_image( TQImageIO *iio )
     char *buf = new char[s.length() + 100];
 
     sprintf( buf, "#define %s_width %d\n", s.ascii(), w );
-    d->writeBlock( buf, qstrlen(buf) );
+    d->writeBlock( buf, tqstrlen(buf) );
     sprintf( buf, "#define %s_height %d\n", s.ascii(), h );
-    d->writeBlock( buf, qstrlen(buf) );
+    d->writeBlock( buf, tqstrlen(buf) );
     sprintf( buf, "static char %s_bits[] = {\n ", s.ascii() );
-    d->writeBlock( buf, qstrlen(buf) );
+    d->writeBlock( buf, tqstrlen(buf) );
 
     iio->setStatus( 0 );
 
@@ -5627,7 +5627,7 @@ static void write_xbm_image( TQImageIO *iio )
                     *p++ = '\n';
                     *p++ = ' ';
                     *p   = '\0';
-                    if ( (int)qstrlen(buf) != d->writeBlock( buf, qstrlen(buf) ) ) {
+                    if ( (int)tqstrlen(buf) != d->writeBlock( buf, tqstrlen(buf) ) ) {
                         iio->setStatus( 1 );
                         delete [] buf;
                         return;
@@ -5639,7 +5639,7 @@ static void write_xbm_image( TQImageIO *iio )
         }
     }
     strcpy( p, " };\n" );
-    if ( (int)qstrlen(buf) != d->writeBlock( buf, qstrlen(buf) ) )
+    if ( (int)tqstrlen(buf) != d->writeBlock( buf, tqstrlen(buf) ) )
 	iio->setStatus( 1 );
     delete [] buf;
 }
@@ -6082,10 +6082,10 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
     //   - 1 bit, identical palette and byte-aligned area
     //
     if ( haveSamePalette(*dst,*src)
-	 && ( dst->depth() != 1 ||
-	      !( (dx&7) || (sx&7) ||
-		 ((sw&7) && (sx+sw < src->width()) ||
-		  (dx+sw < dst->width()) ) ) ) )
+	 && ( (dst->depth() != 1) ||
+	      (!( (dx&7) || (sx&7) ||
+		 (((sw&7) && (sx+sw < src->width())) ||
+		  (dx+sw < dst->width()) ) )) ) )
 	{
 	    // easy to copy
 	} else if ( dst->depth() != 32 ) {
@@ -6103,7 +6103,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
     // Now assume palette can be ignored
 
     if ( dst->depth() != src->depth() ) {
-	if ( sw == src->width() && sh == src->height() || dst->depth()==32 ) {
+	if ( ((sw == src->width()) && (sh == src->height())) || (dst->depth()==32) ) {
 	    TQImage srcconv = src->convertDepth( dst->depth(), conversion_flags );
 	    bitBlt( dst, dx, dy, &srcconv, sx, sy, sw, sh, conversion_flags );
 	} else {
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index a5884db9..a59fecef 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -793,7 +793,7 @@ TQString TQInputContext::language()
 }
 
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 /*!
     This is a preliminary interface for TQt4
  */
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index de1832b2..41fbc2bc 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -488,14 +488,14 @@ void write_jpeg_image(TQImageIO* iio)
 
 	jpeg_set_defaults(&cinfo);
 
-	float diffInch = TQABS(image.dotsPerMeterX()*2.54/100. - qRound(image.dotsPerMeterX()*2.54/100.))
-	                 + TQABS(image.dotsPerMeterY()*2.54/100. - qRound(image.dotsPerMeterY()*2.54/100.));
-	float diffCm = (TQABS(image.dotsPerMeterX()/100. - qRound(image.dotsPerMeterX()/100.))
-	                + TQABS(image.dotsPerMeterY()/100. - qRound(image.dotsPerMeterY()/100.)))*2.54;
+	float diffInch = TQABS(image.dotsPerMeterX()*2.54/100. - tqRound(image.dotsPerMeterX()*2.54/100.))
+	                 + TQABS(image.dotsPerMeterY()*2.54/100. - tqRound(image.dotsPerMeterY()*2.54/100.));
+	float diffCm = (TQABS(image.dotsPerMeterX()/100. - tqRound(image.dotsPerMeterX()/100.))
+	                + TQABS(image.dotsPerMeterY()/100. - tqRound(image.dotsPerMeterY()/100.)))*2.54;
 	if (diffInch < diffCm) {
 	    cinfo.density_unit = 1; // dots/inch
-	    cinfo.X_density = qRound(image.dotsPerMeterX()*2.54/100.);
-	    cinfo.Y_density = qRound(image.dotsPerMeterY()*2.54/100.);
+	    cinfo.X_density = tqRound(image.dotsPerMeterX()*2.54/100.);
+	    cinfo.Y_density = tqRound(image.dotsPerMeterY()*2.54/100.);
 	} else {
 	    cinfo.density_unit = 2; // dots/cm
 	    cinfo.X_density = (image.dotsPerMeterX()+50) / 100;
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index 727b443b..c50110a1 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -203,7 +203,7 @@ public:
 TQKeySequence::TQKeySequence()
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
 }
 
 /*!
@@ -232,7 +232,7 @@ TQKeySequence::TQKeySequence()
 TQKeySequence::TQKeySequence( const TQString& key )
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     assign( key );
 }
 
@@ -248,7 +248,7 @@ TQKeySequence::TQKeySequence( const TQString& key )
 TQKeySequence::TQKeySequence( int key )
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     d->key[0] = key;
 }
 
@@ -263,7 +263,7 @@ TQKeySequence::TQKeySequence( int key )
 TQKeySequence::TQKeySequence( int k1, int k2, int k3, int k4 )
 {
     d = new TQKeySequencePrivate();
-    Q_CHECK_PTR( d );
+    TQ_CHECK_PTR( d );
     d->key[0] = k1;
     d->key[1] = k2;
     d->key[2] = k3;
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index df9229ed..11960dba 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -433,7 +433,7 @@ void TQGridLayoutData::setSize( int r, int c )
 void TQGridLayoutData::setNextPosAfter( int row, int col )
 {
     if ( addVertical ) {
-	if ( col > nextC || col == nextC && row >= nextR ) {
+	if ( (col > nextC) || ((col == nextC) && (row >= nextR)) ) {
 	    nextR = row + 1;
 	    nextC = col;
 	    if ( nextR >= rr ) {
@@ -442,7 +442,7 @@ void TQGridLayoutData::setNextPosAfter( int row, int col )
 	    }
 	}
     } else {
-	if ( row > nextR || row == nextR && col >= nextC ) {
+	if ( (row > nextR) || ((row == nextR) && (col >= nextC)) ) {
 	    nextR = row;
 	    nextC = col + 1;
 	    if ( nextC >= cc ) {
@@ -1398,7 +1398,7 @@ void TQGridLayout::setColStretch( int col, int stretch )
     data->setColStretch( col, stretch );
 }
 
-#if QT_VERSION >= 0x040000
+#if TQT_VERSION >= 0x040000
 #error "Make add{Row,Col}Spacing() inline QT_NO_COMPAT functions defined in terms of set{Row,Col}Spacing()"
 #endif
 
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index d9e6a152..5cdb2052 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -511,7 +511,7 @@ TQMemberDict *TQMetaObject::init( const TQMetaData * data, int n )
     if ( n == 0 )				// nothing, then make no dict
 	return 0;
     TQMemberDict *dict = new TQMemberDict( optDictSize(n), TRUE, FALSE );
-    Q_CHECK_PTR( dict );
+    TQ_CHECK_PTR( dict );
     while ( n-- ) {				// put all members into dict
 	dict->insert( data->name, data );
 	data++;
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 43166067..3c6e634e 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -130,7 +130,7 @@
 class TQMoviePrivate : public TQObject, public TQShared,
 		      private TQDataSink, private TQImageConsumer
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public: // for TQMovie
 
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 619308be..abe951b1 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -148,7 +148,7 @@ public:
     Last but not least, TQObject provides the basic timer support in
     TQt; see TQTimer for high-level support for timers.
 
-    Notice that the Q_OBJECT macro is mandatory for any object that
+    Notice that the TQ_OBJECT macro is mandatory for any object that
     implements signals, slots or properties. You also need to run the
     \link moc.html moc program (Meta Object Compiler) \endlink on the
     source file. We strongly recommend the use of this macro in \e all
@@ -194,7 +194,7 @@ static inline bool isSpace( char x )
 
 static TQCString qt_rmWS( const char *s )
 {
-    TQCString result( qstrlen(s)+1 );
+    TQCString result( tqstrlen(s)+1 );
     char *d = result.data();
     char last = 0;
     while( *s && isSpace(*s) )			// skip leading space
@@ -537,7 +537,7 @@ TQObject::~TQObject()
 
     A meta object contains information about a class that inherits
     TQObject, e.g. class name, superclass name, properties, signals and
-    slots. Every class that contains the Q_OBJECT macro will also have
+    slots. Every class that contains the TQ_OBJECT macro will also have
     a meta object.
 
     The meta object information is required by the signal/slot
@@ -554,7 +554,7 @@ TQObject::~TQObject()
     Object Compiler. \endlink
 
     \warning This function will return the wrong name if the class
-    definition lacks the Q_OBJECT macro.
+    definition lacks the TQ_OBJECT macro.
 
     \sa name(), inherits(), isA(), isWidgetType()
 */
@@ -987,7 +987,7 @@ void TQObject::blockSignals( bool block )
     \code
     class MyObject : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	MyObject( TQObject *parent = 0, const char *name = 0 );
 
@@ -1198,7 +1198,7 @@ TQObjectList *TQObject::queryList( const char *inheritsClass,
 				 bool recursiveSearch ) const
 {
     TQObjectList *list = new TQObjectList;
-    Q_CHECK_PTR( list );
+    TQ_CHECK_PTR( list );
     bool onlyWidgets = ( inheritsClass && qstrcmp(inheritsClass, "TQWidget") == 0 );
 #ifndef QT_NO_REGEXP
     if ( regexpMatch && objName ) {		// regexp matching
@@ -1290,7 +1290,7 @@ void TQObject::insertChild( TQObject *obj )
 
     if ( !childObjects ) {
 	childObjects = new TQObjectList;
-	Q_CHECK_PTR( childObjects );
+	TQ_CHECK_PTR( childObjects );
     } else if ( obj->parentObj == this ) {
 #if defined(QT_CHECK_STATE)
 	qWarning( "TQObject::insertChild: Object %s::%s already in list",
@@ -1409,7 +1409,7 @@ void TQObject::installEventFilter( const TQObject *obj )
 		    this, SLOT(cleanupEventFilter(TQObject*)) );
     } else {
 	eventFilters = new TQObjectList;
-	Q_CHECK_PTR( eventFilters );
+	TQ_CHECK_PTR( eventFilters );
     }
     eventFilters->insert( 0, obj );
     connect( obj, SIGNAL(destroyed(TQObject*)), this, SLOT(cleanupEventFilter(TQObject*)) );
@@ -1644,9 +1644,9 @@ bool TQObject::checkConnectArgs( const char    *signal,
     while ( *s2++ != '(' ) { }
     if ( *s2 == ')' || qstrcmp(s1,s2) == 0 )	// member has no args or
 	return TRUE;				//   exact match
-    int s1len = qstrlen(s1);
-    int s2len = qstrlen(s2);
-    if ( s2len < s1len && qstrncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',' )
+    int s1len = tqstrlen(s1);
+    int s2len = tqstrlen(s2);
+    if ( s2len < s1len && tqstrncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',' )
 	return TRUE;				// member has less args
     return FALSE;
 }
@@ -1702,7 +1702,7 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot )
     \code
     class MyWidget : public TQWidget
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	MyWidget();
 
@@ -1874,14 +1874,14 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
 
     if ( !s->connections ) {			// create connections lookup table
 	s->connections = new TQSignalVec( signal_index+1 );
-	Q_CHECK_PTR( s->connections );
+	TQ_CHECK_PTR( s->connections );
 	s->connections->setAutoDelete( TRUE );
     }
 
     TQConnectionList *clist = s->connections->at( signal_index );
     if ( !clist ) {				// create receiver list
 	clist = new TQConnectionList;
-	Q_CHECK_PTR( clist );
+	TQ_CHECK_PTR( clist );
 	clist->setAutoDelete( TRUE );
 	s->connections->insert( signal_index, clist );
     }
@@ -1899,7 +1899,7 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
     }
 
     TQConnection *c = new TQConnection( r, member_index, rm ? rm->name : "qt_invoke", membcode );
-    Q_CHECK_PTR( c );
+    TQ_CHECK_PTR( c );
     clist->append( c );
     if ( !r->senderObjects )			// create list of senders
 	r->senderObjects = new TQSenderObjectList;
@@ -2113,8 +2113,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 		    success = TRUE;
 		    c = clist->next();
 		} else if ( r == c->object() &&
-			    ( member_index == -1 ||
-			      member_index == c->member() && c->memberType() == membcode ) ) {
+			    ( (member_index == -1) ||
+			      ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		    removeObjFromList( c->object()->senderObjects, s, TRUE );
 		    success = TRUE;
 		    clist->remove();
@@ -2138,8 +2138,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 		success = TRUE;
 		c = clist->next();
 	    } else if ( r == c->object() &&
-			( member_index == -1 ||
-			  member_index == c->member() && c->memberType() == membcode ) ) {
+			( (member_index == -1) ||
+			  ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		removeObjFromList( c->object()->senderObjects, s, TRUE );
 		success = TRUE;
 		clist->remove();
@@ -2209,7 +2209,7 @@ void TQObject::cleanupEventFilter(TQObject* obj)
     Returns a translated version of \a sourceText, or \a sourceText
     itself if there is no appropriate translated version. The
     translation context is TQObject with \a comment (0 by default).
-    All TQObject subclasses using the Q_OBJECT macro automatically have
+    All TQObject subclasses using the TQ_OBJECT macro automatically have
     a reimplementation of this function with the subclass name as
     context.
 
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index aefd8971..e3a2617e 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -526,8 +526,8 @@ static void create_dpis()
     int i, screens =  ScreenCount( dpy );
     dpisX = new int[ screens ];
     dpisY = new int[ screens ];
-    Q_CHECK_PTR( dpisX );
-    Q_CHECK_PTR( dpisY );
+    TQ_CHECK_PTR( dpisX );
+    TQ_CHECK_PTR( dpisY );
     for ( i = 0; i < screens; i++ ) {
 	dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
 
@@ -881,7 +881,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 	    }
 	} else if ( ts == TQInternal::Widget ) {// bitBlt to temp pixmap
 	    pm = new TQPixmap( sw, sh );
-	    Q_CHECK_PTR( pm );
+	    TQ_CHECK_PTR( pm );
 	    bitBlt( pm, 0, 0, src, sx, sy, sw, sh );
 	} else {
 #if defined(QT_CHECK_RANGE)
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index d0d06970..64a11c0b 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -713,12 +713,12 @@ void TQPainter::save()
     TQPStateStack *pss = (TQPStateStack *)ps_stack;
     if ( pss == 0 ) {
 	pss = new TQPtrStack;
-	Q_CHECK_PTR( pss );
+	TQ_CHECK_PTR( pss );
 	pss->setAutoDelete( TRUE );
 	ps_stack = pss;
     }
     TQPState *ps = new TQPState;
-    Q_CHECK_PTR( ps );
+    TQ_CHECK_PTR( ps );
     ps->font  = cfont;
     ps->pen   = cpen;
     ps->curPt = pos();
@@ -838,7 +838,7 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement )
         if ( replacement == 0 )
             return;
         pdev_dict = new TQPaintDeviceDict;
-        Q_CHECK_PTR( pdev_dict );
+        TQ_CHECK_PTR( pdev_dict );
     }
 #if defined(QT_CHECK_NULL)
     if ( pdev == 0 )
@@ -1475,7 +1475,7 @@ void TQPainter::saveWorldMatrix()
     TQWMatrixStack *stack = (TQWMatrixStack *)wm_stack;
     if ( stack == 0 ) {
 	stack  = new TQPtrStack;
-	Q_CHECK_PTR( stack );
+	TQ_CHECK_PTR( stack );
 	stack->setAutoDelete( TRUE );
 	wm_stack = stack;
     }
@@ -1721,16 +1721,16 @@ void TQPainter::map( int x, int y, int *rx, int *ry ) const
 		*ry = y;
 		break;
 	    case TxTranslate:
-		*rx = qRound( x + dx() );
-		*ry = qRound( y + dy() );
+		*rx = tqRound( x + dx() );
+		*ry = tqRound( y + dy() );
 		break;
 	    case TxScale:
-		*rx = qRound( m11()*x + dx() );
-		*ry = qRound( m22()*y + dy() );
+		*rx = tqRound( m11()*x + dx() );
+		*ry = tqRound( m22()*y + dy() );
 		break;
 	    default:
-		*rx = qRound( m11()*x + m21()*y+dx() );
-		*ry = qRound( m12()*x + m22()*y+dy() );
+		*rx = tqRound( m11()*x + m21()*y+dx() );
+		*ry = tqRound( m12()*x + m22()*y+dy() );
 		break;
 	}
     }
@@ -1767,10 +1767,10 @@ void TQPainter::map( int x, int y, int w, int h,
 		double ty1 = m22()*y + dy();
 		double tx2 = m11()*(x + w - 1) + dx();
 		double ty2 = m22()*(y + h - 1) + dy();
-		*rx = qRound( tx1 );
-		*ry = qRound( ty1 );
-		*rw = qRound( tx2 ) - *rx + 1;
-		*rh = qRound( ty2 ) - *ry + 1;
+		*rx = tqRound( tx1 );
+		*ry = tqRound( ty1 );
+		*rw = tqRound( tx2 ) - *rx + 1;
+		*rh = tqRound( ty2 ) - *ry + 1;
 	    } break;
 	    default:
 #if defined(QT_CHECK_STATE)
@@ -1785,15 +1785,15 @@ void TQPainter::map( int x, int y, int w, int h,
 		*rw = w;  *rh = h;
 		break;
 	    case TxTranslate:
-		*rx = qRound(x + dx() );
-		*ry = qRound(y + dy() );
+		*rx = tqRound(x + dx() );
+		*ry = tqRound(y + dy() );
 		*rw = w;  *rh = h;
 		break;
 	    case TxScale:
-		*rx = qRound( m11()*x + dx() );
-		*ry = qRound( m22()*y + dy() );
-		*rw = qRound( m11()*w );
-		*rh = qRound( m22()*h );
+		*rx = tqRound( m11()*x + dx() );
+		*ry = tqRound( m22()*y + dy() );
+		*rw = tqRound( m11()*w );
+		*rh = tqRound( m22()*h );
 		break;
 	    default:
 #if defined(QT_CHECK_STATE)
@@ -1827,8 +1827,8 @@ void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const
 	*rx = tx >= 0 ? int(tx + 0.5) : int(tx - 0.5);
 	*ry = ty >= 0 ? int(ty + 0.5) : int(ty - 0.5);
     } else {
-	*rx = qRound( im11()*x + im21()*y + idx() );
-	*ry = qRound( im12()*x + im22()*y + idy() );
+	*rx = tqRound( im11()*x + im21()*y + idx() );
+	*ry = tqRound( im12()*x + im22()*y + idy() );
     }
 #else
     *rx = x - xlatex;
@@ -1860,10 +1860,10 @@ void TQPainter::mapInv( int x, int y, int w, int h,
 	*rw = tw >= 0 ? int(tw + 0.5) : int(tw - 0.5);
 	*rh = th >= 0 ? int(th + 0.5) : int(th - 0.5);
     } else {
-	*rx = qRound( im11()*x + idx() );
-	*ry = qRound( im22()*y + idy() );
-	*rw = qRound( im11()*w );
-	*rh = qRound( im22()*h );
+	*rx = tqRound( im11()*x + idx() );
+	*ry = tqRound( im22()*y + idy() );
+	*rw = tqRound( im11()*w );
+	*rh = tqRound( im22()*h );
     }
 #else
     *rx = x - xlatex;
@@ -3216,7 +3216,7 @@ TQRect TQPainter::boundingRect( const TQRect &r, int flags,
 void TQPen::init( const TQColor &color, uint width, uint linestyle )
 {
     data = new TQPenData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->style = (PenStyle)(linestyle & MPenStyle);
     data->width = width;
     data->color = color;
@@ -3619,7 +3619,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPen &p )
 void TQBrush::init( const TQColor &color, BrushStyle style )
 {
     data = new TQBrushData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->style	 = style;
     data->color	 = color;
     data->pixmap = 0;
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 6214dc3b..f88f0380 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -205,11 +205,11 @@ const double Q_PI2  = 1.57079632679489661923;   // pi/2
 
 #if defined(Q_CC_GNU) && defined(Q_OS_AIX)
 // AIX 4.2 gcc 2.7.2.3 gets internal error.
-static int qRoundAIX( double d )
+static int tqRoundAIX( double d )
 {
-    return qRound(d);
+    return tqRound(d);
 }
-#define qRound qRoundAIX
+#define tqRound tqRoundAIX
 #endif
 
 
@@ -959,7 +959,7 @@ void TQPainter::updateBrush()
             bool del = FALSE;
             if ( !pm ) {                        // not already in pm dict
                 pm = new TQBitmap( d, d, pat, TRUE );
-                Q_CHECK_PTR( pm );
+                TQ_CHECK_PTR( pm );
                 del = !TQPixmapCache::insert( key, pm );
             }
             if ( cbrush.data->pixmap )
@@ -2187,12 +2187,12 @@ void TQPainter::drawPie( int x, int y, int w, int h, int a, int alen )
         double yc = (double)y+h2;
         double ra1 = Q_PI/2880.0*a;             // convert a, alen to radians
         double ra2 = ra1 + Q_PI/2880.0*alen;
-        int xic = qRound(xc);
-        int yic = qRound(yc);
+        int xic = tqRound(xc);
+        int yic = tqRound(yc);
         XDrawLine( dpy, hd, g, xic, yic,
-                   qRound(xc + qcos(ra1)*w2), qRound(yc - qsin(ra1)*h2));
+                   tqRound(xc + qcos(ra1)*w2), tqRound(yc - qsin(ra1)*h2));
         XDrawLine( dpy, hd, g, xic, yic,
-                   qRound(xc + qcos(ra2)*w2), qRound(yc - qsin(ra2)*h2));
+                   tqRound(xc + qcos(ra2)*w2), tqRound(yc - qsin(ra2)*h2));
         XDrawArc( dpy, hd, g, x, y, w, h, a*4, alen*4 );
     }
 }
@@ -2264,8 +2264,8 @@ void TQPainter::drawChord( int x, int y, int w, int h, int a, int alen )
         double ra1 = Q_PI/2880.0*a;             // convert a, alen to radians
         double ra2 = ra1 + Q_PI/2880.0*alen;
         XDrawLine( dpy, hd, g,
-                   qRound(xc + qcos(ra1)*w2), qRound(yc - qsin(ra1)*h2),
-                   qRound(xc + qcos(ra2)*w2), qRound(yc - qsin(ra2)*h2));
+                   tqRound(xc + qcos(ra1)*w2), tqRound(yc - qsin(ra1)*h2),
+                   tqRound(xc + qcos(ra2)*w2), tqRound(yc - qsin(ra2)*h2));
         XDrawArc( dpy, hd, g, x, y, w, h, a*4, alen*4 );
     }
     XSetArcMode( dpy, gc_brush, ArcPieSlice );
@@ -3138,7 +3138,7 @@ void TQPainter::drawTextItem( int x,  int y, const TQTextItem &ti, int textFlags
     fe->draw( this, x,  y, engine, si, textFlags );
 }
 
-#if QT_VERSION >= 0x040000
+#if TQT_VERSION >= 0x040000
 #error "remove current position and associated methods"
 #endif
 /*!
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index 3821306c..51947caa 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -621,7 +621,7 @@ TQPalette::TQPalette()
 TQPalette::TQPalette( const TQColor &button )
 {
     data = new TQPalData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->ser_no = palette_count++;
     TQColor bg = button, btn = button, fg, base, disfg;
     int h, s, v;
@@ -651,7 +651,7 @@ TQPalette::TQPalette( const TQColor &button )
 TQPalette::TQPalette( const TQColor &button, const TQColor &background )
 {
     data = new TQPalData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->ser_no = palette_count++;
     TQColor bg = background, btn = button, fg, base, disfg;
     int h, s, v;
@@ -686,7 +686,7 @@ TQPalette::TQPalette( const TQColorGroup &active, const TQColorGroup &disabled,
 		    const TQColorGroup &inactive )
 {
     data = new TQPalData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->ser_no = palette_count++;
     data->active = active;
     data->disabled = disabled;
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index aeb0f56e..f7c60ad3 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -612,7 +612,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords )
 		    painter->setTabArray( 0 );
 		} else {
 		    int *ta = new int[i_16];
-		    Q_CHECK_PTR( ta );
+		    TQ_CHECK_PTR( ta );
 		    for ( int i=0; i> i1_16;
 			ta[i] = i1_16;
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index ca1490a5..c03ac42f 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -1384,8 +1384,8 @@ bool qt_xForm_helper( const TQWMatrix &trueMat, int xoffset,
     int m12 = int(trueMat.m12()*65536.0 + 1.);
     int m21 = int(trueMat.m21()*65536.0 + 1.);
     int m22 = int(trueMat.m22()*65536.0 + 1.);
-    int dx  = qRound(trueMat.dx() *65536.0);
-    int dy  = qRound(trueMat.dy() *65536.0);
+    int dx  = tqRound(trueMat.dx() *65536.0);
+    int dy  = tqRound(trueMat.dy() *65536.0);
 
     int m21ydx = dx + (xoffset<<16);
     int m22ydy = dy;
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index 4040b055..2322214c 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -422,7 +422,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim )
 	optim = defOptim;
 
     data = new TQPixmapData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
 
     memset( data, 0, sizeof(TQPixmapData) );
     data->count  = 1;
@@ -747,7 +747,7 @@ TQImage TQPixmap::convertToImage() const
 	xi = XGetImage( x11Display(), hd, 0, 0, w, h, AllPlanes,
 			mono ? XYPixmap : ZPixmap );
     }
-    Q_CHECK_PTR( xi );
+    TQ_CHECK_PTR( xi );
     if (!xi)
         return image; // null image
 
@@ -1180,7 +1180,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	int    ibpl = image.bytesPerLine();
 	if ( image.bitOrder() == TQImage::BigEndian || bpl != ibpl ) {
 	    tmp_bits = new uchar[bpl*h];
-	    Q_CHECK_PTR( tmp_bits );
+	    TQ_CHECK_PTR( tmp_bits );
 	    bits = (char *)tmp_bits;
 	    uchar *p, *b, *end;
 	    uint y, count;
@@ -1287,7 +1287,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
             return false;
 	if( newbits == NULL )
 	newbits = (uchar *)malloc( xi->bytes_per_line*h );
-	Q_CHECK_PTR( newbits );
+	TQ_CHECK_PTR( newbits );
 	if ( !newbits )				// no memory
 	    return FALSE;
 	int    bppc = xi->bits_per_pixel;
@@ -1614,7 +1614,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 
 	newbits = (uchar *)malloc( nbytes );	// copy image into newbits
         newbits_size = nbytes;
-	Q_CHECK_PTR( newbits );
+	TQ_CHECK_PTR( newbits );
 	if ( !newbits )				// no memory
 	    return FALSE;
 	uchar* p = newbits;
@@ -1650,7 +1650,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	PIX *px		   = &pixarr[0];
 	int  maxpop = 0;
 	int  maxpix = 0;
-	Q_CHECK_PTR( pixarr );
+	TQ_CHECK_PTR( pixarr );
 	uint j = 0;
 	TQRgb* ctable = image.colorTable();
 	for ( i=0; i<256; i++ ) {		// init pixel array
@@ -1743,7 +1743,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	    int	    p2inc = xi->bytes_per_line/sizeof(ushort);
 	    ushort *newerbits = (ushort *)malloc( xi->bytes_per_line * h );
             newbits_size = xi->bytes_per_line * h;
-	    Q_CHECK_PTR( newerbits );
+	    TQ_CHECK_PTR( newerbits );
 	    if ( !newerbits )				// no memory
 		return FALSE;
 	    uchar* p = newbits;
@@ -1868,7 +1868,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 		if( axi->data==NULL ) {
 		// the data is deleted by qSafeXDestroyImage
                 axi->data = (char *) malloc(h * axi->bytes_per_line);
-		Q_CHECK_PTR( axi->data );
+		TQ_CHECK_PTR( axi->data );
 		}
                 char *aptr = axi->data;
 
@@ -2075,8 +2075,8 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 	    return *this;			// identity matrix
 	scaledHeight = matrix.m22()*hs;
 	scaledWidth = matrix.m11()*ws;
-	h = TQABS( qRound( scaledHeight ) );
-	w = TQABS( qRound( scaledWidth ) );
+	h = TQABS( tqRound( scaledHeight ) );
+	w = TQABS( tqRound( scaledWidth ) );
     } else {					// rotation or shearing
 	TQPointArray a( TQRect(0,0,ws+1,hs+1) );
 	a = mat.map( a );
@@ -2142,7 +2142,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
     } else {
 #endif
 	dptr = (uchar *)malloc( dbytes );	// create buffer for bits
-	Q_CHECK_PTR( dptr );
+	TQ_CHECK_PTR( dptr );
 	if ( depth1 )				// fill with zeros
 	    memset( dptr, 0, dbytes );
 	else if ( bpp == 8 )			// fill with background color
@@ -2243,7 +2243,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 		bpp  = axi->bits_per_pixel;
 		dbytes = dbpl * h;
 		dptr = (uchar *) malloc(dbytes);
-		Q_CHECK_PTR( dptr );
+		TQ_CHECK_PTR( dptr );
 		memset(dptr, 0, dbytes);
 		if ( axi->bitmap_bit_order == MSBFirst )
 		    type = QT_XFORM_TYPE_MSBFIRST;
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index f29e0402..d2256bb6 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -244,7 +244,7 @@ bool TQPixmapCache::insert( const TQString &key, TQPixmap *pm )
 {
     if ( !pm_cache ) {				// create pixmap cache
 	pm_cache = new TQPMCache;
-	Q_CHECK_PTR( pm_cache );
+	TQ_CHECK_PTR( pm_cache );
 	qpm_cleanup_cache.set( &pm_cache );
     }
     return pm_cache->insert( key, pm, pm->width()*pm->height()*pm->depth()/8 );
@@ -271,7 +271,7 @@ bool TQPixmapCache::insert( const TQString &key, const TQPixmap& pm )
 {
     if ( !pm_cache ) {				// create pixmap cache
 	pm_cache = new TQPMCache;
-	Q_CHECK_PTR( pm_cache );
+	TQ_CHECK_PTR( pm_cache );
 	qpm_cleanup_cache.set( &pm_cache );
     }
     TQPixmap *p = new TQPixmap(pm);
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index eee32c43..c4a5c997 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -1280,7 +1280,7 @@ int TQPNGFormat::user_chunk(png_structp png,
 	return 1;
     } else if ( 0==qstrcmp((char*)png->chunk_name, "gIFx")
 	    && length == 13 ) {
-	if ( qstrncmp((char*)data,"NETSCAPE2.0",11)==0 ) {
+	if ( tqstrncmp((char*)data,"NETSCAPE2.0",11)==0 ) {
 	    int looping = (data[0xC]<<8)|data[0xB];
 	    consumer->setLooping(looping);
 	    return 1;
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index 3258a441..6a9d3748 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -955,8 +955,8 @@ TQPointArray TQPointArray::cubicBezier() const
     m -= 2;
 
     while ( m-- ) {
-	pd->rx() = (TQCOORD)qRound( ((ax * t + bx) * t + cx) * t + x0 );
-	pd->ry() = (TQCOORD)qRound( ((ay * t + by) * t + cy) * t + y0 );
+	pd->rx() = (TQCOORD)tqRound( ((ax * t + bx) * t + cx) * t + x0 );
+	pd->ry() = (TQCOORD)tqRound( ((ay * t + by) * t + cy) * t + y0 );
 	pd++;
 	t += dt;
     }
@@ -988,8 +988,8 @@ TQPointArray TQPointArray::cubicBezier() const
 	TQPointArray pa((len/2)+1); // one extra point for last point on line
 	int j=0;
 	for (i=0; jprintRange = range;
 }
 
diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp
index 64262960..17786eac 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/qprocess.cpp
@@ -730,7 +730,7 @@ void TQProcess::closeStdinLaunch()
 void TQProcess::writeToStdin( const TQString& buf )
 {
     TQByteArray tmp = buf.local8Bit();
-    tmp.resize( qstrlen( tmp.data() ) );
+    tmp.resize( tqstrlen( tmp.data() ) );
     writeToStdin( tmp );
 }
 
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 1c2e0b9f..41260d53 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -176,7 +176,7 @@ public:
  **********************************************************************/
 class TQProcessManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQProcessManager();
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index f52b4371..1fc1190a 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -5901,7 +5901,7 @@ void TQPSPrinterPrivate::emitHeader( bool finished )
     TQString title = printer->docName();
     TQString creator = printer->creator();
     if ( !creator )                             // default creator
-        creator = TQString::fromLatin1("TQt " QT_VERSION_STR);
+        creator = TQString::fromLatin1("TQt " TQT_VERSION_STR);
     outDevice = new TQFile();
     (void)((TQFile *)outDevice)->open( IO_WriteOnly, fd );
     outStream.setDevice( outDevice );
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 2094a00c..3cd7d343 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -2435,7 +2435,7 @@ TQRegion::TQRegion()
     if ( !empty_region ) {			// avoid too many allocs
 	qAddPostRoutine( cleanup_empty_region );
 	empty_region = new TQRegion( TRUE );
-	Q_CHECK_PTR( empty_region );
+	TQ_CHECK_PTR( empty_region );
     }
     data = empty_region->data;
     data->ref();
@@ -2448,7 +2448,7 @@ TQRegion::TQRegion()
 TQRegion::TQRegion( bool is_null )
 {
     data = new TQRegionData;
-    Q_CHECK_PTR( data );
+    TQ_CHECK_PTR( data );
     data->region = new TQRegionPrivate;
     data->is_null = is_null;
     data->rgn = 0;
@@ -2471,13 +2471,13 @@ TQRegion::TQRegion( const TQRect &r, RegionType t )
 	if ( !empty_region ) {			// avoid too many allocs
 	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new TQRegion( TRUE );
-	    Q_CHECK_PTR( empty_region );
+	    TQ_CHECK_PTR( empty_region );
 	}
 	data = empty_region->data;
 	data->ref();
     } else {
 	data = new TQRegionData;
-	Q_CHECK_PTR( data );
+	TQ_CHECK_PTR( data );
 	data->is_null = FALSE;
 	data->rgn = 0;
 	data->xrectangles = 0;
@@ -2508,7 +2508,7 @@ TQRegion::TQRegion( const TQPointArray &a, bool winding )
 {
     if (a.size() > 2) {
 	data = new TQRegionData;
-	Q_CHECK_PTR( data );
+	TQ_CHECK_PTR( data );
 	data->is_null = FALSE;
 	data->rgn = 0;
 	data->xrectangles = 0;
@@ -2518,7 +2518,7 @@ TQRegion::TQRegion( const TQPointArray &a, bool winding )
 	if ( !empty_region ) {
 	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new TQRegion( TRUE );
-	    Q_CHECK_PTR( empty_region );
+	    TQ_CHECK_PTR( empty_region );
 	}
 	data = empty_region->data;
 	data->ref();
@@ -2553,13 +2553,13 @@ TQRegion::TQRegion( const TQBitmap & bm )
 	if ( !empty_region ) {			// avoid too many allocs
 	    qAddPostRoutine( cleanup_empty_region );
 	    empty_region = new TQRegion( TRUE );
-	    Q_CHECK_PTR( empty_region );
+	    TQ_CHECK_PTR( empty_region );
 	}
 	data = empty_region->data;
 	data->ref();
     } else {
 	data = new TQRegionData;
-	Q_CHECK_PTR( data );
+	TQ_CHECK_PTR( data );
 	data->is_null = FALSE;
 	data->rgn = 0;
 	data->xrectangles = 0;
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 7c5453b5..8bac2e01 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -774,7 +774,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList;
 
 class Q_EXPORT TQTextDocument : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 #ifndef QT_NO_TEXTCUSTOMITEM
     friend class TQTextTableCell;
@@ -1040,7 +1040,7 @@ private:
     double scaleFontsFactor;
 
     short list_tm,list_bm, list_lm, li_tm, li_bm, par_tm, par_bm;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextDocument( const TQTextDocument & );
     TQTextDocument &operator=( const TQTextDocument & );
 #endif
diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/qsimplerichtext.cpp
index 20bea6af..e9fd7f1d 100644
--- a/src/kernel/qsimplerichtext.cpp
+++ b/src/kernel/qsimplerichtext.cpp
@@ -244,8 +244,8 @@ void TQSimpleRichText::setWidth( TQPainter *p, int w )
     if ( w == d->cachedWidth  && d->cachedWidthWithPainter )
 	return;
     d->doc->formatter()->setAllowBreakInWords( d->doc->isPageBreakEnabled() ||
-		       p && p->device() &&
-		     p->device()->devType() == TQInternal::Printer );
+		       (p && p->device() &&
+		     (p->device()->devType() == TQInternal::Printer)) );
     p->save();
     d->cachedWidth = w;
     d->cachedWidthWithPainter = TRUE;
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 59f6d0a0..692e89e5 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -87,7 +87,7 @@ public:
 };
 
 class TQAuServerNAS : public TQAuServer {
-    Q_OBJECT
+    TQ_OBJECT
 
     TQSocketNotifier* sn;
 
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h
index d9619e29..74cca189 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/qtextengine_p.h
@@ -284,7 +284,7 @@ public:
 
     TQScriptItemArrayPrivate *d;
 private:
-#ifdef Q_DISABLE_COPY
+#ifdef TQ_DISABLE_COPY
     TQScriptItemArray( const TQScriptItemArray & );
     TQScriptItemArray &operator = ( const TQScriptItemArray & );
 #endif
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index 24239dbd..f9c45d92 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -47,7 +47,7 @@
 #  include "ntqapplication.h"
 #endif // QT_H
 
-#if QT_VERSION >= 0x040000
+#if TQT_VERSION >= 0x040000
 #  error "Remove TQThread::TQThread() and TQThread::start()."
 #endif
 
diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp
index 13bd9bba..ed809899 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/qtimer.cpp
@@ -245,7 +245,7 @@ static void sst_init()
 {
     if ( !sst_list ) {
 	sst_list = new TQObjectList;
-	Q_CHECK_PTR( sst_list );
+	TQ_CHECK_PTR( sst_list );
 	qAddPostRoutine( sst_cleanup );
     }
 }
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 015b6cdb..18d3c839 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -826,7 +826,7 @@ void TQTranslator::squeeze( SaveMode mode )
 	    } else {
 		hTable[i] = (Q_UINT16) ( upto >> 1 );
 		do {
-		    uint len = (uint) qstrlen( con );
+		    uint len = (uint) tqstrlen( con );
 		    len = TQMIN( len, 255 );
 		    t << (Q_UINT8) len;
 		    t.writeRawBytes( con, len );
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index 9bcf665b..16bce332 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -1019,7 +1019,7 @@ int TQWidget::maxInstances = 0;     // Maximum number of widget instances
 void TQWidget::createMapper()
 {
     mapper = new TQWidgetMapper;
-    Q_CHECK_PTR( mapper );
+    TQ_CHECK_PTR( mapper );
 }
 
 /*!
@@ -1048,7 +1048,7 @@ void TQWidget::destroyMapper()
 static TQWidgetList *wListInternal( TQWidgetMapper *mapper, bool onlyTopLevel )
 {
     TQWidgetList *list = new TQWidgetList;
-    Q_CHECK_PTR( list );
+    TQ_CHECK_PTR( list );
     if ( mapper ) {
 	TQWidget *w;
 	TQWidgetIntDictIt it( *((TQWidgetIntDict*)mapper) );
@@ -1167,7 +1167,7 @@ void TQWidget::createExtra()
 {
     if ( !extra ) {				// if not exists
 	extra = new TQWExtra;
-	Q_CHECK_PTR( extra );
+	TQ_CHECK_PTR( extra );
 	extra->minw = extra->minh = 0;
 	extra->maxw = extra->maxh = TQWIDGETSIZE_MAX;
 	extra->bg_pix = 0;
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 9fc3e7d0..da6ec481 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -667,13 +667,13 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	wm_hints.flags |= WindowGroupHint;
 
 	XClassHint class_hint;
-	class_hint.res_name = (char *) qAppName(); // application name
+	class_hint.res_name = (char *) tqAppName(); // application name
 	class_hint.res_class = (char *) qAppClass();	// application class
 
        	XSetWMProperties( dpy, id, 0, 0, 0, 0, &size_hints, &wm_hints, &class_hint );
 
 	XResizeWindow( dpy, id, crect.width(), crect.height() );
-	XStoreName( dpy, id, qAppName() );
+	XStoreName( dpy, id, tqAppName() );
 	Atom protocols[5];
 	int n = 0;
 	protocols[n++] = qt_wm_delete_window;	// support del window protocol
@@ -728,7 +728,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	// declare the widget's object name as window role
 	XChangeProperty( dpy, id,
 			 qt_window_role, XA_STRING, 8, PropModeReplace,
-			 (unsigned char *)name(), qstrlen( name() ) );
+			 (unsigned char *)name(), tqstrlen( name() ) );
 
 	// set client leader property
 	XChangeProperty( dpy, id, qt_wm_client_leader,
@@ -1171,7 +1171,7 @@ void TQWidget::setBackgroundPixmapDirect( const TQPixmap &pixmap )
 	else
 	    createExtra();
 	extra->bg_pix = new TQPixmap( pm );
-	Q_CHECK_PTR( extra->bg_pix );
+	TQ_CHECK_PTR( extra->bg_pix );
 	extra->bg_pix->x11SetScreen( x11Screen() );
 	XSetWindowBackgroundPixmap( x11Display(), winId(), extra->bg_pix->handle() );
 	if ( testWFlags(WType_Desktop) )	// save rootinfo later
@@ -2766,7 +2766,7 @@ void TQWidget::setName( const char *name )
     if ( isTopLevel() ) {
 	XChangeProperty( x11Display(), winId(),
 			 qt_window_role, XA_STRING, 8, PropModeReplace,
-			 (unsigned char *)name, qstrlen( name ) );
+			 (unsigned char *)name, tqstrlen( name ) );
     }
 }
 
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index e85cb00c..10a7c93f 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -246,8 +246,8 @@ TQWMatrix::TransformationMode TQWMatrix::transformationMode()
 { \
     double fx = x; \
     double fy = y; \
-    nx = qRound(_m11*fx + _m21*fy + _dx); \
-    ny = qRound(_m12*fx + _m22*fy + _dy); \
+    nx = tqRound(_m11*fx + _m21*fy + _dx); \
+    ny = tqRound(_m12*fx + _m22*fy + _dy); \
 }
 
 /*****************************************************************************
@@ -447,10 +447,10 @@ TQRect TQWMatrix::mapRect( const TQRect &rect ) const
 	}
     } else {
 	if ( _m12 == 0.0F && _m21 == 0.0F ) {
-	    int x = qRound( _m11*rect.x() + _dx );
-	    int y = qRound( _m22*rect.y() + _dy );
-	    int w = qRound( _m11*rect.width() );
-	    int h = qRound( _m22*rect.height() );
+	    int x = tqRound( _m11*rect.x() + _dx );
+	    int y = tqRound( _m22*rect.y() + _dy );
+	    int w = tqRound( _m11*rect.width() );
+	    int h = tqRound( _m22*rect.height() );
 	    if ( w < 0 ) {
 		w = -w;
 		x -= w-1;
@@ -491,7 +491,7 @@ TQRect TQWMatrix::mapRect( const TQRect &rect ) const
 	    ymin -= ( ymin - y0 ) / h;
 	    xmax -= ( xmax - x0 ) / w;
 	    ymax -= ( ymax - y0 ) / h;
-	    result = TQRect( qRound(xmin), qRound(ymin), qRound(xmax)-qRound(xmin)+1, qRound(ymax)-qRound(ymin)+1 );
+	    result = TQRect( tqRound(xmin), tqRound(ymin), tqRound(xmax)-tqRound(xmin)+1, tqRound(ymax)-tqRound(ymin)+1 );
 	}
     }
     return result;
@@ -505,8 +505,8 @@ TQPoint TQWMatrix::operator *( const TQPoint &p ) const
 {
     double fx = p.x();
     double fy = p.y();
-    return TQPoint( qRound(_m11*fx + _m21*fy + _dx),
-		   qRound(_m12*fx + _m22*fy + _dy) );
+    return TQPoint( tqRound(_m11*fx + _m21*fy + _dx),
+		   tqRound(_m12*fx + _m22*fy + _dy) );
 }
 
 
@@ -580,8 +580,8 @@ TQPointArray TQWMatrix::operator *( const TQPointArray &a ) const
 	TQPointArray result( size );
 	TQPoint *dr = result.data();
 	for( i = 0; i < size; i++ ) {
-	    dr[i].setX( qRound( dp[i].x - (dp[i].x - dp[xminp].x)/w ) );
-	    dr[i].setY( qRound( dp[i].y - (dp[i].y - dp[yminp].y)/h ) );
+	    dr[i].setX( tqRound( dp[i].x - (dp[i].x - dp[xminp].x)/w ) );
+	    dr[i].setY( tqRound( dp[i].y - (dp[i].y - dp[yminp].y)/h ) );
 	}
 	return result;
     }
@@ -599,10 +599,10 @@ TQRegion TQWMatrix::operator * (const TQRect &rect ) const
 	if( qt_old_transformations ) {
 	    result = TQRect( map(rect.topLeft()), map(rect.bottomRight()) ).normalize();
 	} else {
-	    int x = qRound( _m11*rect.x() + _dx );
-	    int y = qRound( _m22*rect.y() + _dy );
-	    int w = qRound( _m11*rect.width() );
-	    int h = qRound( _m22*rect.height() );
+	    int x = tqRound( _m11*rect.x() + _dx );
+	    int y = tqRound( _m22*rect.y() + _dy );
+	    int w = tqRound( _m11*rect.width() );
+	    int h = tqRound( _m22*rect.height() );
 	    if ( w < 0 ) {
 		w = -w;
 		x -= w - 1;
@@ -637,10 +637,10 @@ TQPointArray TQWMatrix::mapToPolygon( const TQRect &rect ) const
     }
     double x[4], y[4];
     if ( _m12 == 0.0F && _m21 == 0.0F ) {
-	x[0] = qRound( _m11*rect.x() + _dx );
-        y[0] = qRound( _m22*rect.y() + _dy );
-	double w = qRound( _m11*rect.width() );
-	double h = qRound( _m22*rect.height() );
+	x[0] = tqRound( _m11*rect.x() + _dx );
+        y[0] = tqRound( _m22*rect.y() + _dy );
+	double w = tqRound( _m11*rect.width() );
+	double h = tqRound( _m22*rect.height() );
 	if ( w < 0 ) {
 	    w = -w;
 	    x[0] -= w - 1.;
@@ -702,16 +702,16 @@ TQPointArray TQWMatrix::mapToPolygon( const TQRect &rect ) const
 #if 0
     int i;
     for( i = 0; i< 4; i++ )
-	qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], qRound(x[i]), qRound(y[i]) );
+	qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], tqRound(x[i]), tqRound(y[i]) );
     qDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ),
 	    sqrt( (x[0]-x[3])*(x[0]-x[3]) + (y[0]-y[3])*(y[0]-y[3]) ) );
 #endif
     // all coordinates are correctly, tranform to a pointarray
     // (rounding to the next integer)
-    a.setPoints( 4, qRound( x[0] ), qRound( y[0] ),
-		 qRound( x[1] ), qRound( y[1] ),
-		 qRound( x[2] ), qRound( y[2] ),
-		 qRound( x[3] ), qRound( y[3] ) );
+    a.setPoints( 4, tqRound( x[0] ), tqRound( y[0] ),
+		 tqRound( x[1] ), tqRound( y[1] ),
+		 tqRound( x[2] ), tqRound( y[2] ),
+		 tqRound( x[3] ), tqRound( y[3] ) );
     return a;
 }
 
@@ -729,10 +729,10 @@ TQRegion TQWMatrix::operator * (const TQRegion &r ) const
     if ( _m12 == 0.0F && _m21 == 0.0F && _m11 > 1.0F && _m22 > 1.0F ) {
 	// simple case, no rotation
 	while ( i ) {
-	    int x = qRound( _m11*rect->x() + _dx );
-	    int y = qRound( _m22*rect->y() + _dy );
-	    int w = qRound( _m11*rect->width() );
-	    int h = qRound( _m22*rect->height() );
+	    int x = tqRound( _m11*rect->x() + _dx );
+	    int y = tqRound( _m22*rect->y() + _dy );
+	    int w = tqRound( _m11*rect->width() );
+	    int h = tqRound( _m22*rect->height() );
 	    if ( w < 0 ) {
 		w = -w;
 		x -= w-1;
diff --git a/src/moc/moc.l b/src/moc/moc.l
index ea566966..9ddce077 100644
--- a/src/moc/moc.l
+++ b/src/moc/moc.l
@@ -124,7 +124,7 @@ STRING		{ALMOSTSTRING}\"
 "template"		{ X;
 				  BEGIN QT_DEF;
 				  return TEMPLATE; }
-"Q_OBJECT"		{ X; return Q_OBJECT; }
+"TQ_OBJECT"		{ X; return TQ_OBJECT; }
 "signals"		{ X; return SIGNALS; }
 "slots"			{ X; return SLOTS; }
 "Q_CLASSINFO"		{ X; return Q_CLASSINFO; }
@@ -144,11 +144,11 @@ STRING		{ALMOSTSTRING}\"
 "signals"		{ X;if( classPLevel == 1 ) return SIGNALS; }
 "slots"		{ X;if( classPLevel == 1 ) return SLOTS; }
 "Q_CLASSINFO"		{ X;if( classPLevel == 1 ) return Q_CLASSINFO; }
-"Q_OBJECT"		{ X;
+"TQ_OBJECT"		{ X;
 				  if ( classPLevel == 1 )
-				      return Q_OBJECT;
+				      return TQ_OBJECT;
 				  else if ( classPLevel > 1 )
-				      moc_warn( "Cannot use Q_OBJECT in nested class." );
+				      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; }
diff --git a/src/moc/moc.y b/src/moc/moc.y
index ce186737..8de0cd73 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -635,8 +635,8 @@ Enum      *tmpEnum;			// current enum
 Access tmpAccess;			// current access permission
 Access subClassPerm;			// current access permission
 
-bool	   Q_OBJECTdetected;		// TRUE if current class
-					//  contains the Q_OBJECT macro
+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
@@ -746,7 +746,7 @@ extern "C" int hack_isatty( int )
 
 %token			SIGNALS
 %token			SLOTS
-%token			Q_OBJECT
+%token			TQ_OBJECT
 %token			Q_PROPERTY
 %token			Q_OVERRIDE
 %token			Q_CLASSINFO
@@ -1178,13 +1178,13 @@ whatever:		  IDENTIFIER
 class_head:		  class_key
 			  qualified_class_name	{ g->className = $2;
 						  if ( g->className == "TQObject" )
-						     Q_OBJECTdetected = TRUE;
+						     TQ_OBJECTdetected = TRUE;
 						}
 			| class_key
 			  IDENTIFIER		/* possible DLL EXPORT macro */
 			  class_name		{ g->className = $3;
 						  if ( g->className == "TQObject" )
-						     Q_OBJECTdetected = TRUE;
+						     TQ_OBJECTdetected = TRUE;
 						}
 			;
 
@@ -1244,13 +1244,13 @@ obj_member_area:	  qt_access_specifier	{ BEGIN QT_DEF; }
 			  slot_area
 			| SIGNALS		{ BEGIN QT_DEF; }
 			  ':'  opt_signal_declarations
-			| Q_OBJECT		{
+			| TQ_OBJECT		{
 			      if ( tmpAccess )
-				  moc_warn("Q_OBJECT is not in the private"
+				  moc_warn("TQ_OBJECT is not in the private"
 					   " section of the class.\n"
-					   "Q_OBJECT is a macro that resets"
+					   "TQ_OBJECT is a macro that resets"
 					   " access permission to \"private\".");
-			      Q_OBJECTdetected = TRUE;
+			      TQ_OBJECTdetected = TRUE;
 			  }
 			| Q_PROPERTY { tmpYYStart = YY_START;
 				       tmpPropOverride = FALSE;
@@ -1734,7 +1734,7 @@ int main( int argc, char **argv )
 	    } else if ( opt == "v" ) {		// version number
 		fprintf( stderr, "TQt Meta Object Compiler version %d"
 				 " (TQt %s)\n", formatRevision,
-				 QT_VERSION_STR );
+				 TQT_VERSION_STR );
 		cleanup();
 		return 1;
 	    } else if ( opt == "k" ) {		// stop on errors
@@ -2018,7 +2018,7 @@ void initClass()				 // prepare for new class
 {
     tmpAccess      = Private;
     subClassPerm       = Private;
-    Q_OBJECTdetected   = FALSE;
+    TQ_OBJECTdetected   = FALSE;
     Q_PROPERTYdetected = FALSE;
     skipClass	       = FALSE;
     templateClass      = FALSE;
@@ -2154,7 +2154,7 @@ inline bool isSpace( char x )
 
 static TQCString rmWS( const char *src )
 {
-    TQCString result( qstrlen(src)+1 );
+    TQCString result( tqstrlen(src)+1 );
     char *d = result.data();
     char *s = (char *)src;
     char last = 0;
@@ -2254,7 +2254,7 @@ int yywrap()					// more files?
 
 char *stradd( const char *s1, const char *s2 )	// adds two strings
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+1];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+1];
     qstrcpy( n, s1 );
     strcat( n, s2 );
     return n;
@@ -2262,7 +2262,7 @@ char *stradd( const char *s1, const char *s2 )	// adds two strings
 
 char *stradd( const char *s1, const char *s2, const char *s3 )// adds 3 strings
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+1];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+1];
     qstrcpy( n, s1 );
     strcat( n, s2 );
     strcat( n, s3 );
@@ -2272,7 +2272,7 @@ char *stradd( const char *s1, const char *s2, const char *s3 )// adds 3 strings
 char *stradd( const char *s1, const char *s2,
 	      const char *s3, const char *s4 )// adds 4 strings
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+qstrlen(s4)+1];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+tqstrlen(s4)+1];
     qstrcpy( n, s1 );
     strcat( n, s2 );
     strcat( n, s3 );
@@ -2283,7 +2283,7 @@ char *stradd( const char *s1, const char *s2,
 
 char *straddSpc( const char *s1, const char *s2 )
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+2];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+2];
     qstrcpy( n, s1 );
     strcat( n, " " );
     strcat( n, s2 );
@@ -2292,7 +2292,7 @@ char *straddSpc( const char *s1, const char *s2 )
 
 char *straddSpc( const char *s1, const char *s2, const char *s3 )
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+3];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+3];
     qstrcpy( n, s1 );
     strcat( n, " " );
     strcat( n, s2 );
@@ -2304,7 +2304,7 @@ char *straddSpc( const char *s1, const char *s2, const char *s3 )
 char *straddSpc( const char *s1, const char *s2,
 	      const char *s3, const char *s4 )
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+qstrlen(s4)+4];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+tqstrlen(s4)+4];
     qstrcpy( n, s1 );
     strcat( n, " " );
     strcat( n, s2 );
@@ -2731,9 +2731,9 @@ int generateProps()
     // Create meta data
     //
     if ( g->props.count() )   {
-	if ( displayWarnings && !Q_OBJECTdetected )
+	if ( displayWarnings && !TQ_OBJECTdetected )
 		moc_err("The declaration of the class \"%s\" contains properties"
-		" but no Q_OBJECT macro.", g->className.data());
+		" but no TQ_OBJECT macro.", g->className.data());
 
 	fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
 
@@ -2813,9 +2813,9 @@ int generateClassInfos()
     if ( g->infos.isEmpty() )
 	return 0;
 
-    if ( displayWarnings && !Q_OBJECTdetected )
+    if ( displayWarnings && !TQ_OBJECTdetected )
 	moc_err("The declaration of the class \"%s\" contains class infos"
-		" but no Q_OBJECT macro.", g->className.data());
+		" but no TQ_OBJECT macro.", g->className.data());
 
     fprintf( out, "    static const TQClassInfo classinfo_tbl[] = {\n" );
     int i = 0;
@@ -2833,7 +2833,7 @@ void generateClass()		      // generate C++ source code for a class
 {
     const char *hdr1 = "/****************************************************************************\n"
 		 "** %s meta object code from reading C++ file '%s'\n**\n";
-    const char *hdr2 = "** Created: %s\n"
+    const char *hdr2 = "** Created: %s\n";
     const char *hdr3 = "** WARNING! All changes made in this file will be lost!\n";
     const char *hdr4 = "*****************************************************************************/\n\n";
     int   i;
@@ -2841,22 +2841,22 @@ void generateClass()		      // generate C++ source code for a class
     if ( skipClass )				// don't generate for class
 	return;
 
-    if ( !Q_OBJECTdetected ) {
+    if ( !TQ_OBJECTdetected ) {
 	if ( g->signals.count() == 0 && g->slots.count() == 0 && g->props.count() == 0 && g->infos.count() == 0 )
 	    return;
 	if ( displayWarnings && (g->signals.count() + g->slots.count()) != 0 )
 	    moc_err("The declaration of the class \"%s\" contains signals "
-		    "or slots\n\t but no Q_OBJECT macro.", g->className.data());
+		    "or slots\n\t but no TQ_OBJECT macro.", g->className.data());
     } else {
 	if ( g->superClassName.isEmpty() )
 	    moc_err("The declaration of the class \"%s\" contains the\n"
-		    "\tQ_OBJECT macro but does not inherit from any class!\n"
+		    "\tTQ_OBJECT macro but does not inherit from any class!\n"
 		    "\tInherit from TQObject or one of its descendants"
-		    " or remove Q_OBJECT.", g->className.data() );
+		    " or remove TQ_OBJECT.", g->className.data() );
     }
     if ( templateClass ) {			// don't generate for class
 	moc_err( "Sorry, TQt does not support templates that contain\n"
-		 "\tsignals, slots or Q_OBJECT." );
+		 "\tsignals, slots or TQ_OBJECT." );
 	return;
     }
     g->generatedCode = TRUE;
@@ -2913,7 +2913,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "#error \"This file was generated using the moc from %s."
 		 " It\"\n#error \"cannot be used with the include files from"
 		 " this version of TQt.\"\n#error \"(The moc has changed too"
-		 " much.)\"\n", QT_VERSION_STR );
+		 " much.)\"\n", TQT_VERSION_STR );
 	fprintf( out, "#endif\n\n" );
     } else {
 	fprintf( out, "\n\n" );
@@ -3114,7 +3114,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 
 	if ( !predef_call_func && !included_list_headers ) {
-	    // yes we need it, because otherwise QT_VERSION may not be defined
+	    // yes we need it, because otherwise TQT_VERSION may not be defined
 	    fprintf( out, "\n#include <%sntqobjectdefs.h>\n", (const char*)g->qtPath );
 	    fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath );
 	    included_list_headers = TRUE;
diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp
index 0bcb929c..cb2651b4 100644
--- a/src/moc/moc_lex.cpp
+++ b/src/moc/moc_lex.cpp
@@ -8,7 +8,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 31
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -30,7 +30,15 @@
 
 /* C99 systems have . Non-C99 systems may or may not. */
 
-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
 #include 
 typedef int8_t flex_int8_t;
 typedef uint8_t flex_uint8_t;
@@ -45,7 +53,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -76,6 +83,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -85,11 +94,12 @@ typedef unsigned int flex_uint32_t;
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -131,9 +141,21 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
 #define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
@@ -165,14 +187,9 @@ extern FILE *yyin, *yyout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -267,7 +284,7 @@ int yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
 /* Flag which is used to allow yywrap()'s to do buffer switches
@@ -360,7 +377,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[615] =
+static yyconst flex_int16_t yy_accept[623] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -369,67 +386,68 @@ static yyconst flex_int16_t yy_accept[615] =
       105,  105,  105,  105,  139,  134,  148,  139,  113,  148,
       148,  148,  130,  148,   99,   99,   99,   99,   99,   99,
        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-       99,   99,   99,  139,  134,  140,  139,  140,  140,  106,
-      106,  106,  106,   15,   16,  139,  134,  141,  139,  141,
-      141,  107,  107,  107,  107,  107,   28,   29,  139,  134,
-
-      145,  139,   54,   55,   58,  145,   59,   56,   57,   60,
-      139,  134,  143,  139,   42,   43,   46,  143,   47,   44,
-       45,  139,  134,  144,  139,   48,   49,   52,  144,   53,
-       50,   51,  139,  134,  142,  139,  111,  142,   13,   14,
-      139,  134,  137,  137,  112,   61,   62,  137,  137,  134,
-      149,  139,  149,  139,  134,  147,  139,  147,  139,  134,
-       34,   35,  100,  100,  100,  100,  100,  104,  101,  102,
-      103,  139,  136,  135,  139,  134,  134,  134,    0,  108,
-        0,  105,  105,  105,  105,  105,  113,    0,    0,  123,
-        0,    0,  132,  131,  130,   92,   99,   99,   99,   99,
+       99,   99,   99,   99,  139,  134,  140,  139,  140,  140,
+      106,  106,  106,  106,  106,   15,   16,  139,  134,  141,
+      139,  141,  141,  107,  107,  107,  107,  107,   28,   29,
+
+      139,  134,  145,  139,   54,   55,   58,  145,   59,   56,
+       57,   60,  139,  134,  143,  139,   42,   43,   46,  143,
+       47,   44,   45,  139,  134,  144,  139,   48,   49,   52,
+      144,   53,   50,   51,  139,  134,  142,  139,  111,  142,
+       13,   14,  139,  134,  137,  137,  112,   61,   62,  137,
+      137,  134,  149,  139,  149,  139,  134,  147,  139,  147,
+      139,  134,   34,   35,  100,  100,  100,  100,  100,  104,
+      101,  102,  103,  139,  136,  135,  139,  134,  134,  134,
+        0,  108,    0,  105,  105,  105,  105,  105,  113,    0,
+        0,  123,    0,    0,  132,  131,  130,   92,   99,   99,
 
        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-       99,   99,   99,   99,   99,   99,   99,   99,    0,  109,
-        0,  106,  106,  106,  106,  106,  106,    0,  110,    0,
-      107,  107,  107,  107,  107,  111,    0,  138,  112,    0,
-      138,  100,  100,  100,  100,  100,  100,  104,    0,  135,
-      134,  105,  105,  105,  105,  114,    0,    0,  114,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       93,  131,   99,   99,   99,   99,   99,   99,   87,   99,
-       99,   99,   99,   99,   99,   99,   99,   99,   99,   76,
-
        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
+       99,    0,  109,    0,  106,  106,  106,  106,  106,  106,
+      106,    0,  110,    0,  107,  107,  107,  107,  107,  111,
+        0,  138,  112,    0,  138,  100,  100,  100,  100,  100,
+      100,  104,    0,  135,  134,  105,  105,  105,  105,  114,
+        0,    0,  114,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   93,  131,   99,   99,   99,   99,
+       99,   99,   99,   87,   99,   99,   99,   99,   99,   99,
+
+       99,   99,   99,   99,   76,   99,   99,   99,   99,   99,
        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-       99,   99,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  107,  107,  107,  107,  100,  100,  100,  100,
-      100,  100,  134,  105,  105,  105,  105,  129,  125,  124,
-      126,    0,  127,  122,  115,  116,  117,  118,  119,  120,
-      121,    0,   99,   99,   99,   99,   99,   99,   99,   65,
-       74,   99,   99,   99,   83,   99,   99,   99,   99,   77,
+       99,   99,   99,   99,   99,   99,   99,  106,  106,  106,
+      106,  106,  106,  106,  106,  106,  106,  106,  107,  107,
+      107,  107,  100,  100,  100,  100,  100,  100,  134,  105,
+      105,  105,  105,  129,  125,  124,  126,    0,  127,  122,
+      115,  116,  117,  118,  119,  120,  121,    0,   99,   99,
+       99,   99,   99,   99,   99,   65,   74,   99,   99,   99,
+       83,   99,   99,   99,   99,   77,   99,   99,   99,   99,
        99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-       99,   99,   99,   99,   99,   99,   99,   99,   99,   82,
-
-       99,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  107,  107,  107,  107,  100,   36,  100,  100,
-      100,  100,  134,    1,  105,  105,    3,  127,  128,   99,
-       99,   99,   99,   99,   99,   99,   84,   72,   99,   99,
-       80,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-       75,   99,   99,    7,   99,   99,   99,   96,   99,   86,
-       99,   97,   99,   99,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,   21,   30,  107,  107,   33,  100,
-       39,  100,  100,   37,  134,  105,  105,   99,   99,   99,
-       99,   99,   12,   99,   81,   68,   63,   69,   99,   99,
-
-       99,   99,   99,   90,   99,   99,   78,   67,   85,   99,
-       99,   99,   99,   99,  106,  106,  106,  106,  106,   27,
-      106,  106,   17,  106,  107,  107,  100,  100,   38,  134,
-      105,  105,   99,   11,   99,   99,   99,   99,   95,   99,
-       99,   88,   99,   99,    6,   99,   64,   99,   71,   99,
-      106,   26,  106,  106,  106,   19,  106,   20,  107,  107,
-      100,  100,  134,  134,  105,    4,   99,    5,   99,   99,
-       99,   99,   91,   99,   66,   94,   79,   73,  106,   23,
-      106,  106,  106,  107,   31,  100,  100,  133,    2,   99,
-       99,   99,   99,   98,   89,  106,  106,  106,   18,   32,
-
-      100,  100,   99,   10,    9,   70,  106,   25,   24,   40,
-       41,    8,   22,    0
+
+       99,   99,   99,   99,   99,   82,   99,  106,  106,  106,
+      106,  106,  106,  106,  106,  106,  106,  106,  107,  107,
+      107,  107,  100,   36,  100,  100,  100,  100,  134,    1,
+      105,  105,    3,  127,  128,   99,   99,   99,   99,   99,
+       99,   99,   84,   72,   99,   99,   80,   99,   99,   99,
+       99,   99,   99,   99,   99,   99,   75,   99,   99,    7,
+       99,   99,   99,   96,   99,   86,   99,   97,   99,   99,
+      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
+       21,   30,  107,  107,   33,  100,   39,  100,  100,   37,
+      134,  105,  105,   99,   99,   99,   99,   12,   99,   99,
+
+       81,   68,   63,   69,   99,   99,   99,   99,   99,   90,
+       99,   99,   78,   67,   85,   99,   99,   99,   99,   99,
+      106,  106,  106,  106,   27,  106,  106,  106,   17,  106,
+      107,  107,  100,  100,   38,  134,  105,  105,   99,   11,
+       99,   99,   99,   99,   95,   99,   99,   88,   99,   99,
+        6,   99,   64,   99,   71,   99,  106,   26,  106,  106,
+      106,   19,  106,   20,  107,  107,  100,  100,  134,  134,
+      105,    4,   99,   99,   99,   99,   99,   99,   91,   99,
+       66,   94,   79,   73,  106,  106,  106,  106,  106,  107,
+       31,  100,  100,  133,    2,   99,   99,   99,    5,   99,
+
+       98,   89,  106,  106,  106,   23,   18,   32,  100,  100,
+       99,   10,    9,   70,  106,   25,   24,   40,   41,    8,
+       22,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -476,160 +494,160 @@ static yyconst flex_int32_t yy_meta[72] =
         1
     } ;
 
-static yyconst flex_int16_t yy_base[642] =
+static yyconst flex_int16_t yy_base[649] =
     {   0,
-        0,    3,   16,    5,   87,    9,  158,  229,  300,  176,
-      370,  440,  207,  510,  382,  555,  184,  399,  600,  645,
-      188,  254,  204,  266,  691,  177,  278,  416, 1189, 1190,
-      182, 1190,  183,  220, 1137, 1190,  196,  207,  214,    0,
-     1130, 1138, 1133, 1121,  260, 1132, 1190,  211, 1137,  243,
-      281,  251,  382, 1164,    0, 1133, 1132,  213,  320, 1118,
-      226,  138, 1118, 1116, 1110, 1126, 1112,  327, 1120,  351,
-      378,  350,  375,  434, 1120, 1190,  408,  394,  442,    0,
-     1123,  392,  403, 1190, 1190,  459, 1118, 1190,  461,  427,
-      458,    0, 1111, 1119, 1114, 1102, 1190, 1190,  471, 1113,
-
-     1190,  464, 1190, 1190, 1190,  465, 1190, 1190, 1190, 1190,
-      477, 1112, 1190,  479, 1190, 1190, 1190,  475, 1190, 1190,
-     1190,  487, 1111, 1190,  489, 1190, 1190, 1190,  484, 1190,
-     1190, 1190,  493, 1110, 1190,  498, 1115,  492, 1190, 1190,
-      501, 1108, 1190,  506, 1113, 1190, 1190,  507,  523, 1106,
-     1190,  528,  514,  530, 1105, 1190,  532,  527,  536, 1104,
-     1190, 1190,    0, 1129, 1128,  411, 1115, 1106, 1190, 1190,
-     1190,  541, 1190,    0,  543,    0,    0, 1098,  505, 1190,
-     1145,    0, 1100, 1089, 1088, 1089, 1099,  543, 1136, 1135,
-      758, 1129,  537,  555,  560, 1190,    0,  554, 1084, 1081,
-
-     1074, 1089, 1088, 1076, 1069, 1068, 1068, 1071, 1074,  220,
-     1070, 1064, 1069, 1074,  522, 1076, 1070, 1063, 1068, 1061,
-      493, 1062, 1057, 1057,  382, 1061, 1054,  524,  517, 1190,
-     1111,    0,  560,  530, 1065, 1059, 1052,  555, 1190, 1107,
-        0, 1062, 1051, 1050, 1051, 1061,  592,  604, 1060,  606,
-      612,    0, 1066,  477, 1066, 1068, 1072, 1055,  612,    0,
-     1046, 1035, 1045, 1035, 1036, 1190, 1087, 1086, 1085,  614,
-      616, 1084, 1083, 1082, 1081, 1080, 1079, 1078, 1077, 1076,
-     1190,  610, 1051, 1048,  465, 1043, 1054, 1019,    0, 1017,
-     1014, 1012, 1011, 1024, 1014, 1019, 1022, 1017, 1012,    0,
-
-     1013, 1018, 1013, 1002,  997,  998, 1004, 1004,  997,  999,
-      993,  992,  990,  993,  993, 1000,  991,  994,  990,  984,
-      996,  998, 1014, 1011,  543, 1006, 1017,  975,  976,  982,
-      979,  973,  973,  983,  973,  974, 1003, 1007, 1005, 1000,
-      991,  988,  970,  962,  961,  966,  968, 1190, 1190, 1190,
-     1190,  620, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190,
-     1190, 1014,  999,  979,  988,  992,  982,  976,  957,    0,
-        0,  950,  948,  954,    0,  948,  945,  949,  948,    0,
-      957,  942,  956,  955,  950,  945,  937,  935,  539,  935,
-      941,  946,  938,  927,  942,  933,  937,  936,  924,    0,
-
-      924,  966,  946,  955,  959,  949,  943,  933,  928,  923,
-      930,  914,  913,  912,  917,  919,  945,    0,  932,  935,
-      944,  943,  908,    0,  905,  917,    0, 1190, 1190,  922,
-      920,  921,  904,  905,  895,  876,    0,    0,  875,  867,
-        0,  867,  858,  845,  836,  832,  824,  832,  775,  759,
-        0,  764,  768,    0,  768,  752,  767,    0,  762,    0,
-      754,    0,  764,  754,  771,  776,  780,  767,  767,  763,
-      736,  749,  748,  740,    0,    0,  735,  747,    0,  761,
-        0,  754,  768,    0,  739,  742,  725,  750,  749,  763,
-      748,  759,    0,  724,    0,    0,    0,    0,  730,  733,
-
-      720,  727,  714,    0,  725,  713,    0,    0,    0,  711,
-      721,  719,  713,  712,  730,  729,  743,  727,  665,    0,
-      636,  623,    0,  623,  637,  620,  662,  661,    0,  636,
-      630,  627,  649,    0,  638,  647,  638,  622,    0,  623,
-      610,    0,  619,  608,    0,  617,    0,  617,    0,  615,
-      637,    0,  624,  633,  624,    0,  608,    0,  609,  605,
-      634,  633,  607,  372,  593,    0,  610,    0,  618,  602,
-      593,  587,    0,  587,    0,    0,    0,    0,  604,    0,
-      612,  594,  581,  570,    0,  581,  562, 1190,    0,  541,
-      451,  413,  376,    0,    0,  361,  357,  255,    0,    0,
-
-      246,  234,  171,    0,    0,    0,  147,    0,    0,    0,
-        0,    0,    0, 1190,  826,  832,  838,  844,  850,  856,
-      862,  868,  874,  880,  886,  888,  894,  900,  902,  908,
-      910,  916,  918,  924,  930,  932,  938,  944,  950,  953,
-      958
+        0,    3,   16,    5,   87,    9,  158,  227,  233,  302,
+      307,  377,  319,  447,  331,  492,  343,  355,  537,  582,
+      369,  390,  395,  398,  628,  311,  425,  464, 1206, 1207,
+      229, 1207,  316,  364, 1154, 1207,  304,  307,  328,    0,
+     1147, 1155, 1150, 1138,  403, 1149, 1207,  352, 1154,  317,
+      403,  374,  425, 1181,    0, 1150, 1160, 1148,  311,  387,
+     1134,  348,  274, 1134, 1132, 1126, 1142, 1128,  370, 1136,
+      407,  428,  361,  401,  476, 1136, 1207,  443,  386,  471,
+        0, 1139, 1149,  423,  430, 1207, 1207,  505, 1133, 1207,
+      487,  407,  489,    0, 1126, 1134, 1129, 1117, 1207, 1207,
+
+      510, 1128, 1207,  512, 1207, 1207, 1207,  496, 1207, 1207,
+     1207, 1207,  515, 1127, 1207,  517, 1207, 1207, 1207,  512,
+     1207, 1207, 1207,  521, 1126, 1207,  526, 1207, 1207, 1207,
+      520, 1207, 1207, 1207,  529, 1125, 1207,  541, 1130,  524,
+     1207, 1207,  545, 1123, 1207,  550, 1128, 1207, 1207,  545,
+      557, 1121, 1207,  559,  554,  563, 1120, 1207,  568,  562,
+      571, 1119, 1207, 1207,    0, 1144, 1143,  420, 1130, 1121,
+     1207, 1207, 1207,  576, 1207,    0,  590,    0,    0, 1113,
+      544, 1207, 1160,    0, 1115, 1104, 1103, 1104, 1114,  593,
+     1151, 1150,  695, 1144,  589,  592,  597, 1207,    0,  678,
+
+     1108, 1098, 1095, 1088, 1103, 1102, 1090, 1083, 1082, 1082,
+     1085, 1088,  286, 1084, 1078, 1083, 1088,  520, 1090, 1084,
+     1077, 1082, 1075,  506, 1076, 1071, 1071,  554, 1075, 1068,
+      543,  577, 1207, 1125,    0,  683, 1081,  558, 1078, 1072,
+     1065,  700, 1207, 1120,    0, 1075, 1064, 1063, 1064, 1074,
+      611,  617, 1073,  619,  717,    0, 1079,  686, 1079, 1081,
+     1085, 1068,  710,    0, 1059, 1048, 1058, 1048, 1049, 1207,
+     1100, 1099, 1098,  715,  718, 1097, 1096, 1095, 1094, 1093,
+     1092, 1091, 1090, 1089, 1207,  712, 1064, 1061, 1052, 1055,
+     1066, 1056, 1030,    0, 1028, 1025, 1023, 1022, 1035, 1025,
+
+     1030, 1033, 1028, 1023,    0, 1024, 1029, 1024, 1013, 1008,
+     1009, 1015, 1015, 1008, 1010, 1004, 1003, 1001, 1004, 1004,
+     1011, 1002, 1005, 1001,  995, 1007, 1009, 1025, 1022, 1013,
+     1016, 1027, 1017,  984,  985,  991,  988,  982,  982,  992,
+      982,  983, 1012, 1016, 1014, 1009, 1000,  997,  979,  971,
+      970,  975,  977, 1207, 1207, 1207, 1207,  724, 1207, 1207,
+     1207, 1207, 1207, 1207, 1207, 1207, 1207, 1023, 1008,  988,
+     1002,  992,  986, 1002,  966,    0,    0,  959,  957,  963,
+        0,  957,  954,  958,  957,    0,  966,  951,  965,  964,
+      959,  954,  946,  944,  573,  944,  950,  955,  947,  936,
+
+      951,  942,  946,  945,  933,    0,  933,  975,  955,  969,
+      959,  953,  969,  942,  937,  932,  939,  923,  922,  921,
+      926,  928,  954,    0,  941,  944,  953,  952,  917,    0,
+      914,  926,    0, 1207, 1207,  935,  940,  934,  935,  931,
+      938,  911,    0,    0,  914,  906,    0,  913,  911,  905,
+      900,  896,  895,  908,  907,  892,    0,  898,  903,    0,
+      903,  888,  903,    0,  898,    0,  890,    0,  900,  891,
+      908,  913,  907,  908,  904,  911,  876,  889,  888,  880,
+        0,    0,  875,  887,    0,  901,    0,  894,  908,    0,
+      879,  882,  865,  890,  889,  889,  900,    0,  899,  864,
+
+        0,    0,    0,    0,  870,  873,  860,  867,  854,    0,
+      865,  853,    0,    0,    0,  851,  861,  861,  855,  854,
+      872,  871,  871,  882,    0,  881,  853,  840,    0,  840,
+      854,  837,  879,  878,    0,  853,  847,  844,  862,    0,
+      854,  840,  849,  819,    0,  814,  801,    0,  806,  795,
+        0,  797,    0,  790,    0,  781,  799,    0,  798,  782,
+      790,    0,  710,    0,  710,  706,  734,  733,  708,  365,
+      700,    0,  718,  726,  710,  708,  699,  690,    0,  690,
+        0,    0,    0,    0,  704,  712,  696,  695,  660,  652,
+        0,  596,  563, 1207,    0,  500,  479,  449,    0,  429,
+
+        0,    0,  448,  429,  379,    0,    0,    0,  364,  339,
+      285,    0,    0,    0,  279,    0,    0,    0,    0,    0,
+        0, 1207,  763,  769,  775,  781,  787,  793,  799,  805,
+      811,  817,  819,  825,  831,  833,  839,  841,  847,  849,
+      855,  861,  863,  869,  875,  881,  884,  889
     } ;
 
-static yyconst flex_int16_t yy_def[642] =
+static yyconst flex_int16_t yy_def[649] =
     {   0,
-      615,  615,  614,    3,  614,    5,  616,  616,  614,    9,
-      617,  617,  618,  618,  619,  619,  620,  620,  621,  621,
-      622,  622,  623,  623,  614,   25,  615,  615,  614,  614,
-      614,  614,  614,  614,  624,  614,  614,  625,  614,  626,
-      626,  626,  626,  626,  614,  624,  614,  614,  627,  628,
-      614,  614,  614,  614,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  614,  624,  614,  614,  630,  614,  631,
-      631,  631,  631,  614,  614,  614,  624,  614,  614,  632,
-      614,  633,  633,  633,  633,  633,  614,  614,  614,  624,
-
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  624,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  624,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  624,  614,  614,  634,  614,  614,  614,
-      614,  624,  614,  614,  635,  614,  614,  614,  614,  624,
-      614,  614,  614,  614,  624,  614,  614,  614,  614,  624,
-      614,  614,  636,  636,  636,  636,  636,  637,  614,  614,
-      614,  614,  614,  638,  614,  624,  624,  624,  625,  614,
-      625,  626,  626,  626,  626,  626,  627,  627,  614,  614,
-      639,  614,  614,  614,  614,  614,  629,  629,  629,  629,
-
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  630,  614,
-      630,  631,  631,  631,  631,  631,  631,  632,  614,  632,
-      633,  633,  633,  633,  633,  634,  634,  614,  635,  635,
-      614,  636,  636,  636,  636,  636,  636,  637,  637,  638,
-      624,  626,  626,  626,  626,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  640,
-      614,  614,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  631,  631,  631,  631,  631,  631,  631,  631,
-      631,  631,  633,  633,  633,  633,  636,  636,  636,  636,
-      636,  636,  624,  626,  626,  626,  626,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  640,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-
-      629,  631,  631,  631,  631,  631,  631,  631,  631,  631,
-      631,  631,  633,  633,  633,  633,  636,  636,  636,  636,
-      636,  636,  624,  626,  626,  626,  626,  614,  614,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  631,  631,  631,  631,  631,  631,
-      631,  631,  631,  631,  631,  633,  633,  633,  633,  636,
-      636,  636,  636,  636,  624,  626,  626,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  631,  631,  631,  631,  631,  631,
-      631,  631,  631,  631,  633,  633,  636,  636,  636,  641,
-      626,  626,  629,  629,  629,  629,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  629,  629,
-      631,  631,  631,  631,  631,  631,  631,  631,  633,  633,
-      636,  636,  641,  641,  626,  626,  629,  629,  629,  629,
-      629,  629,  629,  629,  629,  629,  629,  629,  631,  631,
-      631,  631,  631,  633,  633,  636,  636,  614,  626,  629,
-      629,  629,  629,  629,  629,  631,  631,  631,  631,  633,
-
-      636,  636,  629,  629,  629,  629,  631,  631,  631,  636,
-      636,  629,  631,    0,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614
+      623,  623,  622,    3,  622,    5,  622,    7,  622,    9,
+      624,  624,  625,  625,  626,  626,  627,  627,  628,  628,
+      629,  629,  630,  630,  622,   25,  623,  623,  622,  622,
+      622,  622,  622,  622,  631,  622,  622,  632,  622,  633,
+      633,  633,  633,  633,  622,  631,  622,  622,  634,  635,
+      622,  622,  622,  622,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  622,  631,  622,  622,  637,  622,
+      638,  638,  638,  638,  638,  622,  622,  622,  631,  622,
+      622,  639,  622,  640,  640,  640,  640,  640,  622,  622,
+
+      622,  631,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  631,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  631,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  631,  622,  622,  641,  622,
+      622,  622,  622,  631,  622,  622,  642,  622,  622,  622,
+      622,  631,  622,  622,  622,  622,  631,  622,  622,  622,
+      622,  631,  622,  622,  643,  643,  643,  643,  643,  644,
+      622,  622,  622,  622,  622,  645,  622,  631,  631,  631,
+      632,  622,  632,  633,  633,  633,  633,  633,  634,  634,
+      622,  622,  646,  622,  622,  622,  622,  622,  636,  636,
+
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  637,  622,  637,  638,  638,  638,  638,  638,  638,
+      638,  639,  622,  639,  640,  640,  640,  640,  640,  641,
+      641,  622,  642,  642,  622,  643,  643,  643,  643,  643,
+      643,  644,  644,  645,  631,  633,  633,  633,  633,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  647,  622,  622,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  638,  638,  638,
+      638,  638,  638,  638,  638,  638,  638,  638,  640,  640,
+      640,  640,  643,  643,  643,  643,  643,  643,  631,  633,
+      633,  633,  633,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  647,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+
+      636,  636,  636,  636,  636,  636,  636,  638,  638,  638,
+      638,  638,  638,  638,  638,  638,  638,  638,  640,  640,
+      640,  640,  643,  643,  643,  643,  643,  643,  631,  633,
+      633,  633,  633,  622,  622,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      638,  638,  638,  638,  638,  638,  638,  638,  638,  638,
+      638,  640,  640,  640,  640,  643,  643,  643,  643,  643,
+      631,  633,  633,  636,  636,  636,  636,  636,  636,  636,
+
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      638,  638,  638,  638,  638,  638,  638,  638,  638,  638,
+      640,  640,  643,  643,  643,  648,  633,  633,  636,  636,
+      636,  636,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  636,  636,  638,  638,  638,  638,
+      638,  638,  638,  638,  640,  640,  643,  643,  648,  648,
+      633,  633,  636,  636,  636,  636,  636,  636,  636,  636,
+      636,  636,  636,  636,  638,  638,  638,  638,  638,  640,
+      640,  643,  643,  622,  633,  636,  636,  636,  636,  636,
+
+      636,  636,  638,  638,  638,  638,  638,  640,  643,  643,
+      636,  636,  636,  636,  638,  638,  638,  643,  643,  636,
+      638,    0,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622
     } ;
 
-static yyconst flex_int16_t yy_nxt[1262] =
+static yyconst flex_int16_t yy_nxt[1279] =
     {   0,
-      614,   31,   31,   32,   31,   34,   32,   45,   35,  614,
-       46,   74,   33,  614,   75,   33,   36,   37,   37,   32,
+      622,   31,   31,   32,   31,   34,   32,   45,   35,  622,
+       46,   75,   33,  622,   76,   33,   36,   37,   37,   32,
        38,   36,   36,   36,   36,   36,   36,   36,   39,   36,
        36,   36,   36,   36,   36,   36,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
@@ -641,135 +659,136 @@ static yyconst flex_int16_t yy_nxt[1262] =
 
        53,   53,   53,   54,   47,   47,   47,   55,   55,   55,
        55,   55,   55,   55,   55,   55,   55,   55,   55,   55,
-       55,   55,   56,   55,   55,   55,   55,   55,   55,   55,
-       47,   47,   47,   57,   58,   55,   59,   60,   61,   62,
-       55,   55,   63,   64,   65,   66,   67,   68,   69,   70,
-       71,   72,   73,   55,   55,   55,   47,   47,   76,   77,
-       77,   32,   78,   76,   76,   76,   76,   76,   76,   76,
-       79,   76,   76,   76,   76,   76,   76,   76,   99,   34,
-      613,  100,   35,  172,  172,  136,  136,   32,  137,  152,
-      152,   32,  173,   81,  208,  174,  138,  172,  172,  209,
-
-      153,   76,   76,   76,  612,  157,  157,   32,  114,  114,
-       32,  180,  172,  172,  115,  116,  158,  117,   82,  118,
-       83,  172,  175,  173,  119,  176,  174,   84,   85,   76,
-       77,   86,   32,   78,   87,   76,   76,   76,   76,   76,
-       76,   79,   76,   76,   76,   76,   76,   76,   76,  190,
-      120,  181,  121,  139,  140,  152,  154,   32,  611,  155,
-      173,  172,  175,  174,   81,  176,  153,  157,  159,   32,
-      610,  160,   76,   76,   76,  200,  299,  201,  158,   31,
-       31,   32,  168,  300,  206,  169,  170,  191,  171,   82,
-       33,   83,  192,  207,  193,  193,  193,  609,   84,   85,
-
-       88,   89,   89,   32,   90,   88,   88,   88,   88,   88,
-       88,   88,   91,   88,   88,   88,   88,   88,   88,   88,
-       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   88,   88,   88,   92,   92,   92,   93,
-       92,   92,   92,   92,   92,   92,   92,   92,   94,   92,
-       92,   92,   92,   95,   96,   92,   92,   92,   92,   97,
-       98,  102,  102,   32,  202,  588,  203,  103,  104,  204,
-      105,  608,  106,  125,  125,   32,  607,  107,  215,  126,
-      127,  216,  128,  194,  129,  195,  195,  195,  230,  130,
-
-      136,  141,   32,  137,  142,  218,  219,  220,  225,  172,
-      172,  138,  226,  108,  221,  109,  564,   31,   34,   32,
-      168,   35,  606,  169,  170,  131,  171,  132,   33,  222,
-      227,  239,  223,  255,  228,  172,  175,  317,  231,  176,
-      110,  102,  111,   32,  318,  112,  224,  103,  104,  256,
-      105,  173,  106,  234,  174,  605,  235,  107,  236,  237,
-      172,  175,  172,  172,  176,  172,  172,  173,  139,  140,
-      174,  240,  172,  175,  173,  604,  176,  174,  172,  175,
-      172,  172,  176,  108,  173,  109,  365,  174,  172,  175,
-      172,  172,  176,  173,  172,  175,  174,  338,  176,  172,
-
-      172,  173,  172,  175,  174,  366,  176,  248,  248,  180,
-      110,  114,  122,   32,  339,  123,  173,  115,  116,  174,
-      117,  230,  118,  173,  248,  251,  174,  119,  176,  172,
-      172,  172,  175,  172,  172,  176,  173,  172,  175,  174,
-      312,  176,  172,  172,  172,  175,  187,  187,  176,  181,
-      193,  193,  193,  120,  313,  121,  125,  133,   32,  239,
-      134,  231,  126,  127,  404,  128,  603,  129,  282,  282,
-      282,  194,  130,  195,  195,  195,  283,  305,  284,  321,
-      322,  306,  323,  405,  324,  328,  452,  285,  286,  329,
-      453,  287,  602,  325,  326,  246,  246,  327,  131,  240,
-
-      132,  144,  144,   32,  145,  248,  248,  146,  147,  249,
-      249,  601,  148,  248,  251,  258,  258,  176,  146,  147,
-      351,  600,  353,  282,  282,  282,  428,  352,  352,  352,
-      352,  599,  598,  352,  352,  597,  596,  595,  594,  593,
-      592,  591,  590,  146,  589,  147,  144,  149,   32,  145,
-      150,  564,  146,  147,  587,  586,  585,  148,  584,  583,
-      582,  581,  580,  146,  147,  579,  578,  577,  576,  575,
-      574,  573,  572,  571,  570,  569,  568,  567,  566,  565,
-      564,  562,  561,  560,  559,  558,  557,  556,  146,  555,
-      147,   30,   31,   31,   32,   30,   30,   30,  161,  162,
-
-       30,   30,   30,   33,   30,   30,   30,   30,   30,   30,
-       30,  163,  163,  163,  164,  163,  163,  163,  163,  163,
-      163,  163,  163,  163,  163,  163,  163,  165,  166,  163,
-      163,  163,  167,  163,   30,   30,   30,  163,  163,  163,
-      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
-      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
-       30,   30,  268,  554,  269,  553,  552,  551,  550,  549,
-      548,  270,  271,  547,  546,  545,  544,  543,  542,  541,
-      540,  539,  538,  537,  536,  535,  534,  533,  532,  531,
-      530,  529,  528,  527,  526,  525,  524,  523,  522,  521,
-
-      520,  519,  272,  518,  517,  273,  274,  516,  515,  514,
-      275,  513,  512,  511,  510,  509,  276,  508,  507,  277,
-      506,  278,  505,  279,  504,  280,   30,   30,   30,   30,
-       30,   30,   80,   80,   80,   80,   80,   80,  101,  101,
-      101,  101,  101,  101,  113,  113,  113,  113,  113,  113,
-      124,  124,  124,  124,  124,  124,  135,  135,  135,  135,
-      135,  135,  143,  143,  143,  143,  143,  143,  151,  151,
-      151,  151,  151,  151,  156,  156,  156,  156,  156,  156,
-      177,  503,  177,  177,  177,  177,  179,  502,  179,  179,
-      179,  179,  182,  182,  187,  501,  500,  187,  187,  187,
-
-      189,  499,  189,  189,  189,  189,  197,  197,  229,  498,
-      229,  229,  229,  229,  232,  232,  238,  497,  238,  238,
-      238,  238,  241,  241,  246,  496,  495,  246,  246,  246,
-      249,  494,  493,  249,  249,  249,  252,  252,  258,  492,
-      491,  258,  258,  258,  260,  490,  260,  260,  260,  260,
-      267,  489,  267,  267,  267,  267,  362,  362,  563,  488,
-      563,  563,  563,  563,  487,  486,  485,  484,  483,  482,
-      481,  480,  479,  478,  477,  476,  475,  474,  473,  472,
-      471,  470,  469,  468,  467,  466,  465,  464,  463,  462,
-      461,  460,  459,  458,  457,  456,  455,  454,  451,  450,
-
-      449,  448,  447,  446,  445,  444,  443,  442,  441,  440,
-      439,  438,  437,  436,  435,  434,  433,  432,  431,  430,
-      429,  427,  426,  425,  424,  423,  422,  421,  420,  419,
-      418,  417,  416,  415,  414,  413,  412,  411,  410,  409,
-      408,  407,  406,  403,  402,  401,  400,  399,  398,  397,
-      396,  395,  394,  393,  392,  391,  390,  389,  388,  387,
-      386,  385,  384,  383,  382,  381,  380,  379,  378,  377,
-      376,  375,  374,  373,  372,  371,  370,  369,  368,  367,
-      364,  363,  348,  361,  360,  359,  358,  357,  356,  355,
-      354,  350,  349,  348,  347,  346,  345,  344,  343,  259,
-
-      342,  341,  340,  337,  250,  247,  336,  335,  334,  333,
-      238,  332,  331,  330,  229,  320,  319,  316,  315,  314,
-      311,  310,  309,  308,  307,  304,  303,  302,  301,  298,
-      297,  296,  295,  294,  293,  292,  291,  290,  289,  288,
-      281,  266,  266,  188,  265,  264,  263,  262,  179,  261,
-      259,  257,  254,  253,  178,  178,  178,  250,  178,  247,
-      178,  178,  178,  178,  245,  244,  243,  242,  178,  233,
-      178,  217,  214,  213,  212,  211,  210,  205,  199,  198,
-      196,  188,  178,  186,  185,  184,  183,  178,  614,   29,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614
+       55,   55,   56,   55,   55,   57,   55,   55,   55,   55,
+       47,   47,   47,   58,   59,   55,   60,   61,   62,   63,
+       55,   55,   64,   65,   66,   67,   68,   69,   70,   71,
+       72,   73,   74,   55,   55,   55,   47,   47,   77,   78,
+       78,   32,   79,   77,   77,   77,   77,   77,   77,   77,
+       80,   77,   77,   77,   77,   77,   77,   77,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   82,   81,   81,   83,   81,   81,   81,
+
+       81,   77,   77,   77,   81,   81,   81,   81,   81,   81,
+       81,   81,   81,   81,   81,   81,   81,   81,   84,   81,
+       85,   81,   81,   81,   81,   81,   81,   86,   87,   88,
+      174,  174,   89,   90,   91,   91,   32,   92,   90,   90,
+       90,   90,   90,   90,   90,   93,   90,   90,   90,   90,
+       90,   90,   90,   94,   94,   94,   94,   94,   94,   94,
+       94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
+       94,   94,   94,   94,   94,   94,   90,   90,   90,   94,
+       94,   94,   95,   94,   94,   94,   94,   94,   94,   94,
+       94,   96,   94,   94,   94,   94,   97,   98,   94,   94,
+
+       94,   94,   99,  100,  101,  174,  174,  102,  104,  104,
+       32,  182,  621,   34,  105,  106,   35,  107,  620,  108,
+      116,  116,   32,  192,  109,  175,  117,  118,  176,  119,
+      211,  120,  127,  127,   32,  212,  121,  175,  128,  129,
+      176,  130,  304,  131,  138,  138,   32,  139,  132,  305,
+      110,  183,  111,  174,  174,  140,  138,  143,   32,  139,
+      144,  193,  122,  619,  123,  174,  177,  140,  594,  178,
+      154,  154,   32,  203,  133,  204,  134,  112,  104,  113,
+       32,  155,  114,  175,  105,  106,  176,  107,  618,  108,
+      233,  154,  156,   32,  109,  157,  159,  159,   32,  159,
+
+      161,   32,  155,  162,  174,  177,  209,  160,  178,  570,
+      160,  243,  141,  142,  194,  210,  195,  195,  195,  228,
+      110,  617,  111,  229,  141,  142,   31,   31,   32,  170,
+      234,  218,  171,  172,  219,  173,  196,   33,  197,  197,
+      197,  205,  259,  206,  174,  174,  207,  112,  116,  124,
+       32,  244,  125,  616,  117,  118,  230,  119,  260,  120,
+      231,  221,  222,  223,  121,   31,   34,   32,  170,   35,
+      224,  171,  172,  615,  173,  614,   33,  174,  177,  225,
+      175,  178,  226,  176,  238,  240,  241,  239,  174,  174,
+      122,  613,  123,  127,  135,   32,  227,  136,  175,  128,
+
+      129,  176,  130,  612,  131,  175,  174,  177,  176,  132,
+      178,  174,  177,  174,  174,  178,  174,  177,  174,  174,
+      178,  175,  174,  177,  176,  611,  178,  174,  174,  175,
+      174,  177,  176,  175,  178,  133,  176,  134,  146,  146,
+       32,  147,  174,  174,  148,  149,  174,  177,  182,  150,
+      178,  252,  252,  317,  175,  148,  149,  176,  252,  255,
+      174,  174,  178,  175,  174,  177,  176,  318,  178,  174,
+      174,  175,  174,  177,  176,  310,  178,  174,  174,  311,
+      148,  233,  149,  146,  151,   32,  147,  152,  183,  148,
+      149,  174,  177,  610,  150,  178,  189,  189,  326,  327,
+
+      148,  149,  195,  195,  195,  286,  286,  286,  196,  322,
+      197,  197,  197,  334,  250,  250,  323,  335,  252,  252,
+      458,  234,  253,  253,  459,  148,  609,  149,   30,   31,
+       31,   32,   30,   30,   30,  163,  164,   30,   30,   30,
+       33,   30,   30,   30,   30,   30,   30,   30,  165,  165,
+      165,  166,  165,  165,  165,  165,  165,  165,  165,  165,
+      165,  165,  165,  165,  167,  168,  165,  165,  165,  169,
+      165,   30,   30,   30,  165,  165,  165,  165,  165,  165,
+      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
+      165,  165,  165,  165,  165,  165,  165,   30,   30,  272,
+
+      287,  273,  288,  608,  243,  328,  344,  329,  274,  275,
+      607,  289,  290,  262,  262,  291,  330,  331,  252,  255,
+      332,  357,  178,  345,  359,  286,  286,  286,  358,  358,
+      434,  358,  358,  606,  605,  604,  603,  358,  358,  276,
+      602,  601,  277,  278,  244,  600,  599,  279,  598,  597,
+      596,  595,  570,  280,  593,  592,  281,  591,  282,  590,
+      283,  589,  284,   30,   30,   30,   30,   30,   30,  103,
+      103,  103,  103,  103,  103,  115,  115,  115,  115,  115,
+      115,  126,  126,  126,  126,  126,  126,  137,  137,  137,
+      137,  137,  137,  145,  145,  145,  145,  145,  145,  153,
+
+      153,  153,  153,  153,  153,  158,  158,  158,  158,  158,
+      158,  179,  588,  179,  179,  179,  179,  181,  587,  181,
+      181,  181,  181,  184,  184,  189,  586,  585,  189,  189,
+      189,  191,  584,  191,  191,  191,  191,  199,  199,  232,
+      583,  232,  232,  232,  232,  235,  235,  242,  582,  242,
+      242,  242,  242,  245,  245,  250,  581,  580,  250,  250,
+      250,  253,  579,  578,  253,  253,  253,  256,  256,  262,
+      577,  576,  262,  262,  262,  264,  575,  264,  264,  264,
+      264,  271,  574,  271,  271,  271,  271,  368,  368,  569,
+      573,  569,  569,  569,  569,  572,  571,  570,  568,  567,
+
+      566,  565,  564,  563,  562,  561,  560,  559,  558,  557,
+      556,  555,  554,  553,  552,  551,  550,  549,  548,  547,
+      546,  545,  544,  543,  542,  541,  540,  539,  538,  537,
+      536,  535,  534,  533,  532,  531,  530,  529,  528,  527,
+      526,  525,  524,  523,  522,  521,  520,  519,  518,  517,
+      516,  515,  514,  513,  512,  511,  510,  509,  508,  507,
+      506,  505,  504,  503,  502,  501,  500,  499,  498,  497,
+      496,  495,  494,  493,  492,  491,  490,  489,  488,  487,
+      486,  485,  484,  483,  482,  481,  480,  479,  478,  477,
+      476,  475,  474,  473,  472,  471,  470,  469,  468,  467,
+
+      466,  465,  464,  463,  462,  461,  460,  457,  456,  455,
+      454,  453,  452,  451,  450,  449,  448,  447,  446,  445,
+      444,  443,  442,  441,  440,  439,  438,  437,  436,  435,
+      433,  432,  431,  430,  429,  428,  427,  426,  425,  424,
+      423,  422,  421,  420,  419,  418,  417,  416,  415,  414,
+      413,  412,  411,  410,  409,  408,  407,  406,  405,  404,
+      403,  402,  401,  400,  399,  398,  397,  396,  395,  394,
+      393,  392,  391,  390,  389,  388,  387,  386,  385,  384,
+      383,  382,  381,  380,  379,  378,  377,  376,  375,  374,
+      373,  372,  371,  370,  369,  354,  367,  366,  365,  364,
+
+      363,  362,  361,  360,  356,  355,  354,  353,  352,  351,
+      350,  349,  263,  348,  347,  346,  343,  254,  251,  342,
+      341,  340,  339,  242,  338,  337,  336,  333,  232,  325,
+      324,  321,  320,  319,  316,  315,  314,  313,  312,  309,
+      308,  307,  306,  303,  302,  301,  300,  299,  298,  297,
+      296,  295,  294,  293,  292,  285,  270,  270,  190,  269,
+      268,  267,  266,  181,  265,  263,  261,  258,  257,  180,
+      180,  180,  254,  180,  251,  180,  180,  180,  180,  249,
+      248,  247,  246,  180,  237,  236,  180,  220,  217,  216,
+      215,  214,  213,  208,  202,  201,  200,  198,  190,  180,
+
+      188,  187,  186,  185,  180,  622,   29,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622
     } ;
 
-static yyconst flex_int16_t yy_chk[1262] =
+static yyconst flex_int16_t yy_chk[1279] =
     {   0,
         0,    1,    1,    1,    2,    2,    2,    4,    2,    0,
         4,    6,    1,    0,    6,    2,    3,    3,    3,    3,
@@ -789,127 +808,128 @@ static yyconst flex_int16_t yy_chk[1262] =
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-        7,    7,    7,    7,    7,    7,    7,    7,   10,   26,
-      607,   10,   26,   31,   31,   17,   17,   17,   17,   21,
-       21,   21,   33,    7,   62,   33,   17,   37,   37,   62,
-
-       21,    7,    7,    7,  603,   23,   23,   23,   13,   13,
-       13,   38,   48,   48,   13,   13,   23,   13,    7,   13,
-        7,   34,   34,   39,   13,   34,   39,    7,    7,    8,
-        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-        8,    8,    8,    8,    8,    8,    8,    8,    8,   50,
-       13,   38,   13,   17,   17,   22,   22,   22,  602,   22,
-       52,   45,   45,   52,    8,   45,   22,   24,   24,   24,
-      601,   24,    8,    8,    8,   58,  210,   58,   24,   27,
-       27,   27,   27,  210,   61,   27,   27,   50,   27,    8,
-       27,    8,   51,   61,   51,   51,   51,  598,    8,    8,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
 
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    8,
+       31,   31,    8,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
         9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-        9,   11,   11,   11,   59,  564,   59,   11,   11,   59,
-       11,  597,   11,   15,   15,   15,  596,   11,   68,   15,
-       15,   68,   15,   53,   15,   53,   53,   53,   78,   15,
-
-       18,   18,   18,   18,   18,   70,   70,   70,   72,   77,
-       77,   18,   72,   11,   70,   11,  564,   28,   28,   28,
-       28,   28,  593,   28,   28,   15,   28,   15,   28,   71,
-       73,   90,   71,  166,   73,   74,   74,  225,   78,   74,
-       11,   12,   12,   12,  225,   12,   71,   12,   12,  166,
-       12,   79,   12,   82,   79,  592,   82,   12,   83,   83,
-       86,   86,   89,   89,   86,  102,  102,   91,   18,   18,
-       91,   90,   99,   99,  106,  591,   99,  106,  111,  111,
-      114,  114,  111,   12,  118,   12,  285,  118,  122,  122,
-      125,  125,  122,  129,  133,  133,  129,  254,  133,  136,
-
-      136,  138,  141,  141,  138,  285,  141,  144,  144,  179,
-       12,   14,   14,   14,  254,   14,  148,   14,   14,  148,
-       14,  229,   14,  153,  149,  149,  153,   14,  149,  152,
-      152,  154,  154,  157,  157,  154,  158,  159,  159,  158,
-      221,  159,  172,  172,  175,  175,  188,  188,  175,  179,
-      193,  193,  193,   14,  221,   14,   16,   16,   16,  238,
-       16,  229,   16,   16,  325,   16,  590,   16,  194,  194,
-      194,  195,   16,  195,  195,  195,  198,  215,  198,  228,
-      228,  215,  233,  325,  233,  234,  389,  198,  198,  234,
-      389,  198,  587,  233,  233,  247,  247,  233,   16,  238,
-
-       16,   19,   19,   19,   19,  248,  248,   19,   19,  250,
-      250,  586,   19,  251,  251,  259,  259,  251,   19,   19,
-      270,  584,  271,  282,  282,  282,  352,  270,  270,  271,
-      271,  583,  582,  352,  352,  581,  579,  574,  572,  571,
-      570,  569,  567,   19,  565,   19,   20,   20,   20,   20,
-       20,  563,   20,   20,  562,  561,  560,   20,  559,  557,
-      555,  554,  553,   20,   20,  551,  550,  548,  546,  544,
-      543,  541,  540,  538,  537,  536,  535,  533,  532,  531,
-      530,  528,  527,  526,  525,  524,  522,  521,   20,  519,
-       20,   25,   25,   25,   25,   25,   25,   25,   25,   25,
 
+        9,    9,    9,    9,   10,   37,   37,   10,   11,   11,
+       11,   38,  615,   26,   11,   11,   26,   11,  611,   11,
+       13,   13,   13,   50,   11,   33,   13,   13,   33,   13,
+       63,   13,   15,   15,   15,   63,   13,   39,   15,   15,
+       39,   15,  213,   15,   17,   17,   17,   17,   15,  213,
+       11,   38,   11,   48,   48,   17,   18,   18,   18,   18,
+       18,   50,   13,  610,   13,   34,   34,   18,  570,   34,
+       21,   21,   21,   59,   15,   59,   15,   11,   12,   12,
+       12,   21,   12,   52,   12,   12,   52,   12,  609,   12,
+       79,   22,   22,   22,   12,   22,   23,   23,   23,   24,
+
+       24,   24,   22,   24,   45,   45,   62,   23,   45,  570,
+       24,   92,   17,   17,   51,   62,   51,   51,   51,   73,
+       12,  605,   12,   73,   18,   18,   27,   27,   27,   27,
+       79,   69,   27,   27,   69,   27,   53,   27,   53,   53,
+       53,   60,  168,   60,   78,   78,   60,   12,   14,   14,
+       14,   92,   14,  604,   14,   14,   74,   14,  168,   14,
+       74,   71,   71,   71,   14,   28,   28,   28,   28,   28,
+       71,   28,   28,  603,   28,  600,   28,   75,   75,   72,
+       80,   75,   72,   80,   84,   85,   85,   84,   91,   91,
+       14,  598,   14,   16,   16,   16,   72,   16,   93,   16,
+
+       16,   93,   16,  597,   16,  108,   88,   88,  108,   16,
+       88,  101,  101,  104,  104,  101,  113,  113,  116,  116,
+      113,  120,  124,  124,  120,  596,  124,  127,  127,  131,
+      135,  135,  131,  140,  135,   16,  140,   16,   19,   19,
+       19,   19,  138,  138,   19,   19,  143,  143,  181,   19,
+      143,  146,  146,  224,  150,   19,   19,  150,  151,  151,
+      154,  154,  151,  155,  156,  156,  155,  224,  156,  159,
+      159,  160,  161,  161,  160,  218,  161,  174,  174,  218,
+       19,  232,   19,   20,   20,   20,   20,   20,  181,   20,
+       20,  177,  177,  593,   20,  177,  190,  190,  231,  231,
+
+       20,   20,  195,  195,  195,  196,  196,  196,  197,  228,
+      197,  197,  197,  238,  251,  251,  228,  238,  252,  252,
+      395,  232,  254,  254,  395,   20,  592,   20,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
        25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-       25,   25,  191,  518,  191,  517,  516,  515,  514,  513,
-      512,  191,  191,  511,  510,  506,  505,  503,  502,  501,
-      500,  499,  494,  492,  491,  490,  489,  488,  487,  486,
-      485,  483,  482,  480,  478,  477,  474,  473,  472,  471,
-
-      470,  469,  191,  468,  467,  191,  191,  466,  465,  464,
-      191,  463,  461,  459,  457,  456,  191,  455,  453,  191,
-      452,  191,  450,  191,  449,  191,  615,  615,  615,  615,
-      615,  615,  616,  616,  616,  616,  616,  616,  617,  617,
-      617,  617,  617,  617,  618,  618,  618,  618,  618,  618,
-      619,  619,  619,  619,  619,  619,  620,  620,  620,  620,
-      620,  620,  621,  621,  621,  621,  621,  621,  622,  622,
-      622,  622,  622,  622,  623,  623,  623,  623,  623,  623,
-      624,  448,  624,  624,  624,  624,  625,  447,  625,  625,
-      625,  625,  626,  626,  627,  446,  445,  627,  627,  627,
-
-      628,  444,  628,  628,  628,  628,  629,  629,  630,  443,
-      630,  630,  630,  630,  631,  631,  632,  442,  632,  632,
-      632,  632,  633,  633,  634,  440,  439,  634,  634,  634,
-      635,  436,  435,  635,  635,  635,  636,  636,  637,  434,
-      433,  637,  637,  637,  638,  432,  638,  638,  638,  638,
-      639,  431,  639,  639,  639,  639,  640,  640,  641,  430,
-      641,  641,  641,  641,  426,  425,  423,  422,  421,  420,
-      419,  417,  416,  415,  414,  413,  412,  411,  410,  409,
-      408,  407,  406,  405,  404,  403,  402,  401,  399,  398,
-      397,  396,  395,  394,  393,  392,  391,  390,  388,  387,
-
-      386,  385,  384,  383,  382,  381,  379,  378,  377,  376,
-      374,  373,  372,  369,  368,  367,  366,  365,  364,  363,
-      362,  347,  346,  345,  344,  343,  342,  341,  340,  339,
-      338,  337,  336,  335,  334,  333,  332,  331,  330,  329,
-      328,  327,  326,  324,  323,  322,  321,  320,  319,  318,
-      317,  316,  315,  314,  313,  312,  311,  310,  309,  308,
-      307,  306,  305,  304,  303,  302,  301,  299,  298,  297,
-      296,  295,  294,  293,  292,  291,  290,  288,  287,  286,
-      284,  283,  280,  279,  278,  277,  276,  275,  274,  273,
-      272,  269,  268,  267,  265,  264,  263,  262,  261,  258,
-
-      257,  256,  255,  253,  249,  246,  245,  244,  243,  242,
-      240,  237,  236,  235,  231,  227,  226,  224,  223,  222,
-      220,  219,  218,  217,  216,  214,  213,  212,  211,  209,
-      208,  207,  206,  205,  204,  203,  202,  201,  200,  199,
-      192,  190,  189,  187,  186,  185,  184,  183,  181,  178,
-      168,  167,  165,  164,  160,  155,  150,  145,  142,  137,
-      134,  123,  112,  100,   96,   95,   94,   93,   87,   81,
-       75,   69,   67,   66,   65,   64,   63,   60,   57,   56,
-       54,   49,   46,   44,   43,   42,   41,   35,   29,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614,  614,  614,  614,  614,  614,  614,  614,  614,  614,
-      614
+       25,   25,   25,   25,   25,   25,   25,   25,   25,  193,
+
+      200,  193,  200,  590,  242,  236,  258,  236,  193,  193,
+      589,  200,  200,  263,  263,  200,  236,  236,  255,  255,
+      236,  274,  255,  258,  275,  286,  286,  286,  274,  274,
+      358,  275,  275,  588,  587,  586,  585,  358,  358,  193,
+      580,  578,  193,  193,  242,  577,  576,  193,  575,  574,
+      573,  571,  569,  193,  568,  567,  193,  566,  193,  565,
+      193,  563,  193,  623,  623,  623,  623,  623,  623,  624,
+      624,  624,  624,  624,  624,  625,  625,  625,  625,  625,
+      625,  626,  626,  626,  626,  626,  626,  627,  627,  627,
+      627,  627,  627,  628,  628,  628,  628,  628,  628,  629,
+
+      629,  629,  629,  629,  629,  630,  630,  630,  630,  630,
+      630,  631,  561,  631,  631,  631,  631,  632,  560,  632,
+      632,  632,  632,  633,  633,  634,  559,  557,  634,  634,
+      634,  635,  556,  635,  635,  635,  635,  636,  636,  637,
+      554,  637,  637,  637,  637,  638,  638,  639,  552,  639,
+      639,  639,  639,  640,  640,  641,  550,  549,  641,  641,
+      641,  642,  547,  546,  642,  642,  642,  643,  643,  644,
+      544,  543,  644,  644,  644,  645,  542,  645,  645,  645,
+      645,  646,  541,  646,  646,  646,  646,  647,  647,  648,
+      539,  648,  648,  648,  648,  538,  537,  536,  534,  533,
+
+      532,  531,  530,  528,  527,  526,  524,  523,  522,  521,
+      520,  519,  518,  517,  516,  512,  511,  509,  508,  507,
+      506,  505,  500,  499,  497,  496,  495,  494,  493,  492,
+      491,  489,  488,  486,  484,  483,  480,  479,  478,  477,
+      476,  475,  474,  473,  472,  471,  470,  469,  467,  465,
+      463,  462,  461,  459,  458,  456,  455,  454,  453,  452,
+      451,  450,  449,  448,  446,  445,  442,  441,  440,  439,
+      438,  437,  436,  432,  431,  429,  428,  427,  426,  425,
+      423,  422,  421,  420,  419,  418,  417,  416,  415,  414,
+      413,  412,  411,  410,  409,  408,  407,  405,  404,  403,
+
+      402,  401,  400,  399,  398,  397,  396,  394,  393,  392,
+      391,  390,  389,  388,  387,  385,  384,  383,  382,  380,
+      379,  378,  375,  374,  373,  372,  371,  370,  369,  368,
+      353,  352,  351,  350,  349,  348,  347,  346,  345,  344,
+      343,  342,  341,  340,  339,  338,  337,  336,  335,  334,
+      333,  332,  331,  330,  329,  328,  327,  326,  325,  324,
+      323,  322,  321,  320,  319,  318,  317,  316,  315,  314,
+      313,  312,  311,  310,  309,  308,  307,  306,  304,  303,
+      302,  301,  300,  299,  298,  297,  296,  295,  293,  292,
+      291,  290,  289,  288,  287,  284,  283,  282,  281,  280,
+
+      279,  278,  277,  276,  273,  272,  271,  269,  268,  267,
+      266,  265,  262,  261,  260,  259,  257,  253,  250,  249,
+      248,  247,  246,  244,  241,  240,  239,  237,  234,  230,
+      229,  227,  226,  225,  223,  222,  221,  220,  219,  217,
+      216,  215,  214,  212,  211,  210,  209,  208,  207,  206,
+      205,  204,  203,  202,  201,  194,  192,  191,  189,  188,
+      187,  186,  185,  183,  180,  170,  169,  167,  166,  162,
+      157,  152,  147,  144,  139,  136,  125,  114,  102,   98,
+       97,   96,   95,   89,   83,   82,   76,   70,   68,   67,
+       66,   65,   64,   61,   58,   57,   56,   54,   49,   46,
+
+       44,   43,   42,   41,   35,   29,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622,  622,  622,
+      622,  622,  622,  622,  622,  622,  622,  622
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -928,22 +948,22 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "moc.l"
 /****************************************************************************
-** $Id: qt/moc_lex.cpp   3.3.8   edited Feb 2 14:59 $
 **
 ** Lexical analyzer for meta object compiler
 **
 ** Created : 930417
 **
-** Copyright (C) 1992-2007 Trolltech ASA.  All rights reserved.
+** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
 **
 ** This file is part of the TQt GUI Toolkit.
 **
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Alternatively you may (at your option) use any
-** later version of the GNU General Public License if such license has
-** been publicly approved by Trolltech ASA (or its successors, if any)
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
@@ -966,7 +986,7 @@ char *yytext;
 ** herein.
 **
 *****************************************************************************/
-#line 39 "moc.l"
+#line 42 "moc.l"
 #ifdef MOC_YACC_CODE
 
 #ifdef MOC_MWERKS_PLUGIN
@@ -1032,7 +1052,7 @@ extern void addExpressionChar( const char );
 extern void addExpressionString( const char * );
 extern void moc_warn( const char *msg );
 
-#line 1033 "lex.yy.c"
+#line 1056 "lex.yy.c"
 
 #define INITIAL 0
 #define OUTSIDE 1
@@ -1061,6 +1081,37 @@ extern void moc_warn( const char *msg );
 #define YY_EXTRA_TYPE void *
 #endif
 
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+int yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -1095,7 +1146,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -1103,7 +1159,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1199,14 +1255,14 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 110 "moc.l"
+#line 113 "moc.l"
 
 
-#line 1203 "lex.yy.c"
+#line 1262 "lex.yy.c"
 
-	if ( (yy_init) )
+	if ( !(yy_init) )
 		{
-		(yy_init) = 0;
+		(yy_init) = 1;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
@@ -1256,13 +1312,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 615 )
+				if ( yy_current_state >= 623 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 1190 );
+		while ( yy_base[yy_current_state] != 1207 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -1288,341 +1344,341 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 112 "moc.l"
+#line 115 "moc.l"
 { X;
 				  BEGIN QT_DEF;
 				  return CLASS; }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 115 "moc.l"
+#line 118 "moc.l"
 { X;
 				  BEGIN QT_DEF;
 				  return NAMESPACE; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 118 "moc.l"
+#line 121 "moc.l"
 { X;
                                   BEGIN QT_DEF;
 				  return USING; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 121 "moc.l"
+#line 124 "moc.l"
 { X;
 				  BEGIN QT_DEF;
 				  return TEMPLATE; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 124 "moc.l"
-{ X; return Q_OBJECT; }
+#line 127 "moc.l"
+{ X; return TQ_OBJECT; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 125 "moc.l"
+#line 128 "moc.l"
 { X; return SIGNALS; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 126 "moc.l"
+#line 129 "moc.l"
 { X; return SLOTS; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 127 "moc.l"
+#line 130 "moc.l"
 { X; return Q_CLASSINFO; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 128 "moc.l"
+#line 131 "moc.l"
 { X; return Q_PROPERTY; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 129 "moc.l"
+#line 132 "moc.l"
 { X; return Q_OVERRIDE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 130 "moc.l"
+#line 133 "moc.l"
 { X; return Q_ENUMS; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 131 "moc.l"
+#line 134 "moc.l"
 { X; return Q_SETS; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 133 "moc.l"
+#line 136 "moc.l"
 { fctLevel++;Y; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 134 "moc.l"
+#line 137 "moc.l"
 { fctLevel--;Y;if (fctLevel==0){X;return '}';}}
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 135 "moc.l"
+#line 138 "moc.l"
 { classPLevel++;Y; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 136 "moc.l"
+#line 139 "moc.l"
 { classPLevel--;Y;if (classPLevel == 0)
                                                       {X;return '}';} }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 138 "moc.l"
+#line 141 "moc.l"
 { X;if( classPLevel == 1 ) return PUBLIC; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 139 "moc.l"
+#line 142 "moc.l"
 { X;if( classPLevel == 1 ) return PROTECTED; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 140 "moc.l"
+#line 143 "moc.l"
 { X;if( classPLevel == 1 ) return PRIVATE; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 141 "moc.l"
+#line 144 "moc.l"
 { X;if( classPLevel == 1 ) return SIGNALS; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 142 "moc.l"
+#line 145 "moc.l"
 { X;if( classPLevel == 1 ) return SLOTS; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 143 "moc.l"
+#line 146 "moc.l"
 { X;if( classPLevel == 1 ) return Q_CLASSINFO; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 144 "moc.l"
+#line 147 "moc.l"
 { X;
 				  if ( classPLevel == 1 )
-				      return Q_OBJECT;
+				      return TQ_OBJECT;
 				  else if ( classPLevel > 1 )
-				      moc_warn( "Cannot use Q_OBJECT in nested class." );
+				      moc_warn( "Cannot use TQ_OBJECT in nested class." );
 				}
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 150 "moc.l"
+#line 153 "moc.l"
 { X;if( classPLevel == 1 ) return Q_PROPERTY; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 151 "moc.l"
+#line 154 "moc.l"
 { X;if( classPLevel == 1 ) return Q_OVERRIDE; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 152 "moc.l"
+#line 155 "moc.l"
 { X;if( classPLevel == 1 ) return Q_ENUMS; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 153 "moc.l"
+#line 156 "moc.l"
 { X;if( classPLevel == 1 ) return Q_SETS; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 155 "moc.l"
+#line 158 "moc.l"
 { namespacePLevel++;Y; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 156 "moc.l"
+#line 159 "moc.l"
 { namespacePLevel--;Y;if (namespacePLevel == 0)
                                                           {X;return '}';}}
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 158 "moc.l"
+#line 161 "moc.l"
 { X;
                                   BEGIN QT_DEF;
 				  return CLASS; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 161 "moc.l"
+#line 164 "moc.l"
 { X;
                                   BEGIN QT_DEF;
                                   return TEMPLATE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 164 "moc.l"
+#line 167 "moc.l"
 { X;
 				  BEGIN QT_DEF;
 				  return NAMESPACE; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 167 "moc.l"
+#line 170 "moc.l"
 { X;
                                   BEGIN QT_DEF;
 				  return USING; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 171 "moc.l"
+#line 174 "moc.l"
 { X; return '('; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 172 "moc.l"
+#line 175 "moc.l"
 { X; return ')'; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 173 "moc.l"
+#line 176 "moc.l"
 { X; return READ; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 174 "moc.l"
+#line 177 "moc.l"
 { X; return WRITE; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 175 "moc.l"
+#line 178 "moc.l"
 { X; return STORED; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 176 "moc.l"
+#line 179 "moc.l"
 { X; return RESET; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 177 "moc.l"
+#line 180 "moc.l"
 { X; return DESIGNABLE; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 178 "moc.l"
+#line 181 "moc.l"
 { X; return SCRIPTABLE; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 181 "moc.l"
+#line 184 "moc.l"
 { expLevel++;X; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 182 "moc.l"
+#line 185 "moc.l"
 { expLevel--;Y;if (expLevel == 0)
 					{ X; BEGIN QT_DEF; return ')';} }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 184 "moc.l"
+#line 187 "moc.l"
 { expLevel++;X; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 185 "moc.l"
+#line 188 "moc.l"
 { expLevel--;X;if (expLevel == 0)
 					{ X; BEGIN QT_DEF; return ']';} }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 187 "moc.l"
+#line 190 "moc.l"
 { if (expLevel == 0)
 					{ X; BEGIN QT_DEF; return ',' ;} }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 189 "moc.l"
+#line 192 "moc.l"
 { if (expLevel == 0)
 					{ X; BEGIN QT_DEF; return ';' ;} }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 191 "moc.l"
+#line 194 "moc.l"
 { expLevel++;X; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 192 "moc.l"
+#line 195 "moc.l"
 { expLevel--;Y;if (expLevel == 0)
 					{ X; BEGIN QT_DEF; return ')';} }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 194 "moc.l"
+#line 197 "moc.l"
 { expLevel++;X; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 195 "moc.l"
+#line 198 "moc.l"
 { expLevel--;X;if (expLevel == 0)
 					{ X; BEGIN QT_DEF; return ']';} }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 197 "moc.l"
+#line 200 "moc.l"
 { if (expLevel <= 1)
 					{ X; BEGIN QT_DEF; return ',' ;} }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 199 "moc.l"
+#line 202 "moc.l"
 { if (expLevel == 0)
 					{ X; BEGIN QT_DEF; return ';' ;} }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 201 "moc.l"
+#line 204 "moc.l"
 { enumLevel++;X; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 202 "moc.l"
+#line 205 "moc.l"
 { enumLevel--;X; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 203 "moc.l"
+#line 206 "moc.l"
 { enumLevel++;X; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 204 "moc.l"
+#line 207 "moc.l"
 { enumLevel--;X }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 205 "moc.l"
+#line 208 "moc.l"
 { if (enumLevel == 0)
 					{ X; BEGIN QT_DEF; return ',' ;} }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 207 "moc.l"
+#line 210 "moc.l"
 { if (enumLevel == 0)
 					{ X; BEGIN QT_DEF; return ';' ;} }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 209 "moc.l"
+#line 212 "moc.l"
 { if (enumLevel == 0)
 					{ X; BEGIN QT_DEF; return '}' ;} }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 211 "moc.l"
+#line 214 "moc.l"
 { templLevel++;
 				  Y;
 				  addExpressionChar( yytext[0] );
@@ -1630,7 +1686,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 215 "moc.l"
+#line 218 "moc.l"
 { templLevel--;
 				  Y;
 				  if ( templLevel == 0 ) {
@@ -1644,187 +1700,187 @@ YY_RULE_SETUP
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 225 "moc.l"
+#line 228 "moc.l"
 { X;return FRIEND; }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 226 "moc.l"
+#line 229 "moc.l"
 { X;return TYPEDEF; }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 227 "moc.l"
+#line 230 "moc.l"
 { X;return AUTO; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 228 "moc.l"
+#line 231 "moc.l"
 { X;return REGISTER; }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 229 "moc.l"
+#line 232 "moc.l"
 { X;return STATIC; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 230 "moc.l"
+#line 233 "moc.l"
 { X;return EXTERN; }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 231 "moc.l"
+#line 234 "moc.l"
 { X;return INLINE; }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 232 "moc.l"
+#line 235 "moc.l"
 { X;return INLINE; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 233 "moc.l"
+#line 236 "moc.l"
 { X;return VIRTUAL; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 234 "moc.l"
+#line 237 "moc.l"
 { X;return CONST; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 235 "moc.l"
+#line 238 "moc.l"
 { X;return VOLATILE; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 236 "moc.l"
+#line 239 "moc.l"
 { X;return CHAR; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 237 "moc.l"
+#line 240 "moc.l"
 { X;return SHORT; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 238 "moc.l"
+#line 241 "moc.l"
 { X;return INT; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 239 "moc.l"
+#line 242 "moc.l"
 { X;return LONG; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 240 "moc.l"
+#line 243 "moc.l"
 { X;return SIGNED; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 241 "moc.l"
+#line 244 "moc.l"
 { X;return UNSIGNED; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 242 "moc.l"
+#line 245 "moc.l"
 { X;return FLOAT; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 243 "moc.l"
+#line 246 "moc.l"
 { X;return DOUBLE; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 244 "moc.l"
+#line 247 "moc.l"
 { X;return VOID; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 245 "moc.l"
+#line 248 "moc.l"
 { X;return ENUM; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 246 "moc.l"
+#line 249 "moc.l"
 { X;return CLASS; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 247 "moc.l"
+#line 250 "moc.l"
 { X;return STRUCT; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 248 "moc.l"
+#line 251 "moc.l"
 { X;return UNION; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 249 "moc.l"
+#line 252 "moc.l"
 { X;return ASM; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 250 "moc.l"
+#line 253 "moc.l"
 { X;return PRIVATE; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 251 "moc.l"
+#line 254 "moc.l"
 { X;return PROTECTED; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 252 "moc.l"
+#line 255 "moc.l"
 { X;return PUBLIC; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 253 "moc.l"
+#line 256 "moc.l"
 { X;return OPERATOR; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 254 "moc.l"
+#line 257 "moc.l"
 { X;return DBL_COLON; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 255 "moc.l"
+#line 258 "moc.l"
 { X;return TRIPLE_DOT; }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 256 "moc.l"
+#line 259 "moc.l"
 { X;return TEMPLATE; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 257 "moc.l"
+#line 260 "moc.l"
 { X;return MUTABLE; }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 258 "moc.l"
+#line 261 "moc.l"
 { X;return THROW; }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 259 "moc.l"
+#line 262 "moc.l"
 { X;return USING; }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 260 "moc.l"
+#line 263 "moc.l"
 { X;return NAMESPACE; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 262 "moc.l"
+#line 265 "moc.l"
 {
 			  X;
 			  yylval.string = qstrdup(yytext);
@@ -1833,7 +1889,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 268 "moc.l"
+#line 271 "moc.l"
 {
 			  X;
 			  yylval.string = qstrdup(yytext);
@@ -1842,23 +1898,23 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 274 "moc.l"
+#line 277 "moc.l"
 { X; return '('; }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 275 "moc.l"
+#line 278 "moc.l"
 { X; return ')'; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 276 "moc.l"
+#line 279 "moc.l"
 { X; return ','; }
 	YY_BREAK
 case 104:
 /* rule 104 can match eol */
 YY_RULE_SETUP
-#line 278 "moc.l"
+#line 281 "moc.l"
 {
 			  X;
 			  yylval.string = qstrdup( yytext + 1 );
@@ -1868,23 +1924,23 @@ YY_RULE_SETUP
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 285 "moc.l"
+#line 288 "moc.l"
 ;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 286 "moc.l"
+#line 289 "moc.l"
 ;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 287 "moc.l"
+#line 290 "moc.l"
 ;
 	YY_BREAK
 case 108:
 /* rule 108 can match eol */
 YY_RULE_SETUP
-#line 289 "moc.l"
+#line 292 "moc.l"
 {				/* discard strings */
 			  Z;
 			}
@@ -1892,7 +1948,7 @@ YY_RULE_SETUP
 case 109:
 /* rule 109 can match eol */
 YY_RULE_SETUP
-#line 293 "moc.l"
+#line 296 "moc.l"
 {				/* discard strings */
 			  Z;
 			}
@@ -1900,7 +1956,7 @@ YY_RULE_SETUP
 case 110:
 /* rule 110 can match eol */
 YY_RULE_SETUP
-#line 297 "moc.l"
+#line 300 "moc.l"
 {			/* discard strings */
 			  Z;
 			}
@@ -1908,7 +1964,7 @@ YY_RULE_SETUP
 case 111:
 /* rule 111 can match eol */
 YY_RULE_SETUP
-#line 301 "moc.l"
+#line 304 "moc.l"
 {			/* discard strings */
 			  Z;
 			  addExpressionString( yytext );
@@ -1918,7 +1974,7 @@ YY_RULE_SETUP
 case 112:
 /* rule 112 can match eol */
 YY_RULE_SETUP
-#line 308 "moc.l"
+#line 311 "moc.l"
 {
 			  X;
 			  addExpressionString( yytext );
@@ -1929,7 +1985,7 @@ YY_RULE_SETUP
 case 113:
 /* rule 113 can match eol */
 YY_RULE_SETUP
-#line 315 "moc.l"
+#line 318 "moc.l"
 {
 			  X;
 			  yylval.string = qstrdup( yytext + 1 );
@@ -1939,7 +1995,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 322 "moc.l"
+#line 325 "moc.l"
 { X;
 			  yylval.char_val = yytext[1];
 			  return CHAR_VAL;
@@ -1947,7 +2003,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 327 "moc.l"
+#line 330 "moc.l"
 { X;
 			 yylval.char_val = '\a';
 			 return CHAR_VAL;
@@ -1955,7 +2011,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 332 "moc.l"
+#line 335 "moc.l"
 { X;
 			 yylval.char_val = '\b';
 			 return CHAR_VAL;
@@ -1963,7 +2019,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 337 "moc.l"
+#line 340 "moc.l"
 { X;
 			 yylval.char_val = '\f';
 			 return CHAR_VAL;
@@ -1971,7 +2027,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 342 "moc.l"
+#line 345 "moc.l"
 { X;
 			 yylval.char_val = '\n';
 			 return CHAR_VAL;
@@ -1979,7 +2035,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 347 "moc.l"
+#line 350 "moc.l"
 { X;
 			 yylval.char_val = '\r';
 			 return CHAR_VAL;
@@ -1987,7 +2043,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 352 "moc.l"
+#line 355 "moc.l"
 { X;
 			 yylval.char_val = '\t';
 			 return CHAR_VAL;
@@ -1995,7 +2051,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 357 "moc.l"
+#line 360 "moc.l"
 { X;
 			 yylval.char_val = '\v';
 			 return CHAR_VAL;
@@ -2003,7 +2059,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 362 "moc.l"
+#line 365 "moc.l"
 { X;
 			 yylval.char_val = '\\';
 			 return CHAR_VAL;
@@ -2011,7 +2067,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 367 "moc.l"
+#line 370 "moc.l"
 { X;
 			 yylval.char_val = '\?';
 			 return CHAR_VAL;
@@ -2019,7 +2075,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 372 "moc.l"
+#line 375 "moc.l"
 { X;
 			 yylval.char_val = '\'';
 			 return CHAR_VAL;
@@ -2027,7 +2083,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 377 "moc.l"
+#line 380 "moc.l"
 { X;
 			 yylval.char_val = '\"';	/* " */
 			 return CHAR_VAL;
@@ -2035,7 +2091,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 382 "moc.l"
+#line 385 "moc.l"
 { X;
 			 yylval.char_val = '\0';
 			 return CHAR_VAL;
@@ -2043,7 +2099,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 387 "moc.l"
+#line 390 "moc.l"
 { X;
 			 yylval.char_val =
 			   (char)strtol( &yytext[1], 0, 8 );
@@ -2052,7 +2108,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 393 "moc.l"
+#line 396 "moc.l"
 { X;
 			 yylval.char_val =
 			   (char)strtol( &yytext[2], 0, 16 );
@@ -2061,7 +2117,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 399 "moc.l"
+#line 402 "moc.l"
 { X;
 			 yylval.char_val = ' ';
 			 return CHAR_VAL;
@@ -2069,7 +2125,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 404 "moc.l"
+#line 407 "moc.l"
 { X;
 			  yylval.int_val = atoi(yytext);
 			  return INT_VAL;
@@ -2077,7 +2133,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 409 "moc.l"
+#line 412 "moc.l"
 { X;
 			  yylval.double_val = atof(yytext);
 			  return DOUBLE_VAL;
@@ -2085,7 +2141,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 414 "moc.l"
+#line 417 "moc.l"
 { X;
 			  yylval.double_val = atof(yytext);
 			  return DOUBLE_VAL;
@@ -2096,7 +2152,7 @@ case 133:
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 420 "moc.l"
+#line 423 "moc.l"
 { /* skip multi-line macro-definitions */
 			  int c, c1;
 			  input();   /* Discard the '\n'. */
@@ -2110,12 +2166,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 431 "moc.l"
+#line 434 "moc.l"
 { /* preprocessor commands are skipped */}
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 432 "moc.l"
+#line 435 "moc.l"
 { /* C++ comment */
 			  TQCString s = yytext;
                           if ( s.contains( "MOC_SKIP_BEGIN" ) ) {
@@ -2139,7 +2195,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 452 "moc.l"
+#line 455 "moc.l"
 { /* C comment */
 			  int c = ' ';
 			  do {
@@ -2155,12 +2211,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 465 "moc.l"
+#line 468 "moc.l"
 { addExpressionChar( yytext[0] ); }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 467 "moc.l"
+#line 470 "moc.l"
 {
 				    /* spaces are important in template args,
 				       e.g. Foo */
@@ -2168,52 +2224,52 @@ YY_RULE_SETUP
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 471 "moc.l"
+#line 474 "moc.l"
 ;
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 472 "moc.l"
+#line 475 "moc.l"
 ;
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 473 "moc.l"
+#line 476 "moc.l"
 ;
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 474 "moc.l"
+#line 477 "moc.l"
 ;
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 475 "moc.l"
+#line 478 "moc.l"
 { addExpressionChar( yytext[0] ); }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 476 "moc.l"
+#line 479 "moc.l"
 ;
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 477 "moc.l"
+#line 480 "moc.l"
 { addExpressionChar( yytext[0] ); }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 478 "moc.l"
+#line 481 "moc.l"
 ;
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 479 "moc.l"
+#line 482 "moc.l"
 ;
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 480 "moc.l"
+#line 483 "moc.l"
 {
 			  X;
 			  return yytext[0];
@@ -2221,7 +2277,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 484 "moc.l"
+#line 487 "moc.l"
 {
 			  X;
 			  return ';';
@@ -2230,17 +2286,17 @@ YY_RULE_SETUP
 case 150:
 /* rule 150 can match eol */
 YY_RULE_SETUP
-#line 488 "moc.l"
+#line 491 "moc.l"
 {
 			  lineNo++;
 			}
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 493 "moc.l"
+#line 496 "moc.l"
 ECHO;
 	YY_BREAK
-#line 2241 "lex.yy.c"
+#line 2300 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(OUTSIDE):
 case YY_STATE_EOF(QT_DEF):
@@ -2439,7 +2495,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -2484,7 +2540,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -2508,6 +2564,14 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -2538,7 +2602,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 615 )
+			if ( yy_current_state >= 623 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2566,11 +2630,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 615 )
+		if ( yy_current_state >= 623 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 614);
+	yy_is_jam = (yy_current_state == 622);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -2926,7 +2990,9 @@ static void yyensure_buffer_stack (void)
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -2944,6 +3010,8 @@ static void yyensure_buffer_stack (void)
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -2988,26 +3056,26 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
 {
     
-	return yy_scan_bytes(yy_str,strlen(yy_str) );
+	return yy_scan_bytes(yystr,strlen(yystr) );
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
@@ -3015,15 +3083,15 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
 	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
+	n = _yybytes_len + 2;
 	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
 
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
 	b = yy_scan_buffer(buf,n );
 	if ( ! b )
@@ -3144,6 +3212,34 @@ void yyset_debug (int  bdebug )
         yy_flex_debug = bdebug ;
 }
 
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
 int yylex_destroy  (void)
 {
@@ -3159,6 +3255,10 @@ int yylex_destroy  (void)
 	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
     return 0;
 }
 
@@ -3170,7 +3270,7 @@ int yylex_destroy  (void)
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
 	register int i;
-    	for ( i = 0; i < n; ++i )
+	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
 #endif
@@ -3179,7 +3279,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 static int yy_flex_strlen (yyconst char * s )
 {
 	register int n;
-    	for ( n = 0; s[n]; ++n )
+	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
@@ -3210,19 +3310,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#undef YY_NEW_FILE
-#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
-#undef yy_new_buffer
-#undef yy_set_interactive
-#undef yytext_ptr
-#undef YY_DO_BEFORE_ACTION
-
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
-#endif
-#line 493 "moc.l"
+#line 496 "moc.l"
 
 
 
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index 575f1f6b..41a8449d 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -1,14 +1,75 @@
-#ifndef lint
-static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#define YYRECOVERING (yyerrflag!=0)
-#define YYPREFIX "yy"
-#line 55 "moc.y"
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.4.1"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Copy the first part of user declarations.  */
+
+/* Line 189 of yacc.c  */
+#line 57 "moc.y"
+
 #define MOC_YACC_CODE
 void yyerror( const char *msg );
 
@@ -52,10 +113,10 @@ bool isEnumType( const char* type );
 int enumIndex( const char* type );
 bool isVariantType( const char* type );
 int qvariant_nameToType( const char* name );
-static void init();				/* initialize*/
-static void initClass();			/* prepare for new class*/
-static void generateClass();			/* generate C++ code for class*/
-static void initExpression();			/* prepare for new expression*/
+static void init();				// initialize
+static void initClass();			// prepare for new class
+static void generateClass();			// generate C++ code for class
+static void initExpression();			// prepare for new expression
 static void enterNameSpace( const char *name = 0 );
 static void leaveNameSpace();
 static void selectOutsideClassState();
@@ -79,7 +140,7 @@ static const char* const utype_map[] =
 };
 
 inline bool isIdentChar( char x )
-{						/* Avoid bug in isalnum*/
+{						// Avoid bug in isalnum
     return x == '_' || (x >= '0' && x <= '9') ||
 	 (x >= 'a' && x <= 'z') || (x >= 'A' && x <= 'Z');
 }
@@ -278,7 +339,7 @@ static TQCString rmWS( const char * );
 enum Access { Private, Protected, Public };
 
 
-class Argument					/* single arg meta data*/
+class Argument					// single arg meta data
 {
 public:
     Argument( const char *left, const char *right, const char* argName = 0, bool isDefaultArgument = FALSE )
@@ -326,7 +387,7 @@ public:
     bool isDefault;
 };
 
-class ArgList : public TQPtrList {	/* member function arg list*/
+class ArgList : public TQPtrList {	// member function arg list
 public:
     ArgList() { setAutoDelete( TRUE ); }
     ~ArgList() { clear(); }
@@ -363,10 +424,10 @@ public:
 };
 
 
-struct Function					/* member function meta data*/
+struct Function					// member function meta data
 {
     Access access;
-    TQCString    qualifier;			/* const or volatile*/
+    TQCString    qualifier;			// const or volatile
     TQCString    name;
     TQCString    type;
     TQCString    signature;
@@ -383,7 +444,7 @@ struct Function					/* member function meta data*/
     }
 };
 
-class FuncList : public TQPtrList {	/* list of member functions*/
+class FuncList : public TQPtrList {	// list of member functions
 public:
     FuncList( bool autoDelete = FALSE ) { setAutoDelete( autoDelete ); }
 
@@ -405,7 +466,7 @@ public:
     bool set;
 };
 
-class EnumList : public TQPtrList {		/* list of property enums*/
+class EnumList : public TQPtrList {		// list of property enums
 public:
     EnumList() { setAutoDelete(TRUE); }
 };
@@ -452,10 +513,10 @@ struct Property
     Function* setfunc;
     Function* getfunc;
 
-    int oredEnum; /* If the enums item may be ored. That means the data type is int.*/
-		  /* Allowed values are 1 (True), 0 (False), and -1 (Unset)*/
-    TQCString enumsettype; /* contains the set function type in case of oredEnum*/
-    TQCString enumgettype; /* contains the get function type in case of oredEnum*/
+    int oredEnum; // If the enums item may be ored. That means the data type is int.
+		  // Allowed values are 1 (True), 0 (False), and -1 (Unset)
+    TQCString enumsettype; // contains the set function type in case of oredEnum
+    TQCString enumgettype; // contains the get function type in case of oredEnum
 
     enum Specification  { Unspecified, Class, Reference, Pointer, ConstCharStar };
     Specification sspec;
@@ -485,7 +546,7 @@ struct Property
     }
 };
 
-class PropList : public TQPtrList {	/* list of properties*/
+class PropList : public TQPtrList {	// list of properties
 public:
     PropList() { setAutoDelete( TRUE ); }
 };
@@ -500,7 +561,7 @@ struct ClassInfo
     TQCString value;
 };
 
-class ClassInfoList : public TQPtrList {	/* list of class infos*/
+class ClassInfoList : public TQPtrList {	// list of class infos
 public:
     ClassInfoList() { setAutoDelete( TRUE ); }
 };
@@ -510,61 +571,61 @@ class parser_reg {
     parser_reg();
     ~parser_reg();
 
-    /* some temporary values*/
-    TQCString   tmpExpression;			/* Used to store the characters the lexer*/
-						/* is currently skipping (see addExpressionChar and friends)*/
-    TQCString  fileName;				/* file name*/
-    TQCString  outputFile;				/* output file name*/
-    TQCString  pchFile;				/* name of PCH file (used on Windows)*/
-    TQStrList  includeFiles;			/* name of #include files*/
-    TQCString  includePath;				/* #include file path*/
-    TQCString  qtPath;				/* #include qt file path*/
-    int           gen_count; /*number of classes generated*/
-    bool	  noInclude;		/* no #include */
-    bool	  generatedCode;		/* no code generated*/
-    bool	  mocError;			/* moc parsing error occurred*/
-    bool       hasVariantIncluded;	/*whether or not ntqvariant.h was included yet*/
-    TQCString  className;				/* name of parsed class*/
-    TQCString  superClassName;			/* name of first super class*/
-    TQStrList  multipleSuperClasses;			/* other superclasses*/
-    FuncList  signals;				/* signal interface*/
-    FuncList  slots;				/* slots interface*/
-    FuncList  propfuncs;				/* all possible property access functions*/
-    FuncList  funcs;			/* all parsed functions, including signals*/
-    EnumList  enums;				/* enums used in properties*/
-    PropList  props;				/* list of all properties*/
-    ClassInfoList	infos;				/* list of all class infos*/
-
-/* Used to store the values in the Q_PROPERTY macro*/
-    TQCString propWrite;				/* set function*/
-    TQCString propRead;				/* get function*/
-    TQCString propReset;				/* reset function*/
-    TQCString propStored;				/**/
-    TQCString propDesignable;				/* "true", "false" or function or empty if not specified*/
-    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*/
+    // some temporary values
+    TQCString   tmpExpression;			// Used to store the characters the lexer
+						// is currently skipping (see addExpressionChar and friends)
+    TQCString  fileName;				// file name
+    TQCString  outputFile;				// output file name
+    TQCString  pchFile;				// name of PCH file (used on Windows)
+    TQStrList  includeFiles;			// name of #include files
+    TQCString  includePath;				// #include file path
+    TQCString  qtPath;				// #include qt file path
+    int           gen_count; //number of classes generated
+    bool	  noInclude;		// no #include 
+    bool	  generatedCode;		// no code generated
+    bool	  mocError;			// moc parsing error occurred
+    bool       hasVariantIncluded;	//whether or not ntqvariant.h was included yet
+    TQCString  className;				// name of parsed class
+    TQCString  superClassName;			// name of first super class
+    TQStrList  multipleSuperClasses;			// other superclasses
+    FuncList  signals;				// signal interface
+    FuncList  slots;				// slots interface
+    FuncList  propfuncs;				// all possible property access functions
+    FuncList  funcs;			// all parsed functions, including signals
+    EnumList  enums;				// enums used in properties
+    PropList  props;				// list of all properties
+    ClassInfoList	infos;				// list of all class infos
+
+// Used to store the values in the Q_PROPERTY macro
+    TQCString propWrite;				// set function
+    TQCString propRead;				// get function
+    TQCString propReset;				// reset function
+    TQCString propStored;				//
+    TQCString propDesignable;				// "true", "false" or function or empty if not specified
+    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
 
 };
 
 static parser_reg *g = 0;
 
-ArgList *addArg( Argument * );			/* add arg to tmpArgList*/
+ArgList *addArg( Argument * );			// add arg to tmpArgList
 
 enum Member { SignalMember,
 	      SlotMember,
 	      PropertyCandidateMember
 	    };
 
-void	 addMember( Member );			/* add tmpFunc to current class*/
-void     addEnum();				/* add tmpEnum to current class*/
+void	 addMember( Member );			// add tmpFunc to current class
+void     addEnum();				// add tmpEnum to current class
 
-char	*stradd( const char *, const char * );	/* add two strings*/
-char	*stradd( const char *, const char *,	/* add three strings*/
+char	*stradd( const char *, const char * );	// add two strings
+char	*stradd( const char *, const char *,	// add three strings
 			       const char * );
-char 	*stradd( const char *, const char *,	/* adds 4 strings*/
+char 	*stradd( const char *, const char *,	// adds 4 strings
 		 const char *, const char * );
 
 char	*straddSpc( const char *, const char * );
@@ -575,35 +636,35 @@ char	*straddSpc( const char *, const char *,
 
 extern int yydebug;
 bool	   lexDebug	   = FALSE;
-int	   lineNo;			/* current line number*/
-bool	   errorControl	   = FALSE;	/* controled errors*/
+int	   lineNo;			// current line number
+bool	   errorControl	   = FALSE;	// controled errors
 bool	   displayWarnings = TRUE;
-bool	   skipClass;			/* don't generate for class*/
-bool	   skipFunc;			/* don't generate for func*/
-bool	   templateClass;		/* class is a template*/
-bool	   templateClassOld;		/* previous class is a template*/
-
-ArgList	  *tmpArgList;			/* current argument list*/
-Function  *tmpFunc;			/* current member function*/
-Enum      *tmpEnum;			/* current enum*/
-Access tmpAccess;			/* current access permission*/
-Access subClassPerm;			/* current access permission*/
-
-bool	   Q_OBJECTdetected;		/* TRUE if current class*/
-					/*  contains the Q_OBJECT macro*/
-bool	   Q_PROPERTYdetected;		/* TRUE if current class*/
-					/*  contains at least one Q_PROPERTY,*/
-					/*  Q_OVERRIDE, Q_SETS or Q_ENUMS macro*/
-bool	   tmpPropOverride;		/* current property override setting*/
-
-int	   tmpYYStart;			/* Used to store the lexers current mode*/
-int	   tmpYYStart2;			/* Used to store the lexers current mode*/
-					/*  (if tmpYYStart is already used)*/
-
-/* if the format revision changes, you MUST change it in ntqmetaobject.h too*/
-const int formatRevision = 26;		/* moc output format revision*/
-
-/* if the flags change, you HAVE to change it in ntqmetaobject.h too*/
+bool	   skipClass;			// don't generate for class
+bool	   skipFunc;			// don't generate for func
+bool	   templateClass;		// class is a template
+bool	   templateClassOld;		// previous class is a template
+
+ArgList	  *tmpArgList;			// current argument list
+Function  *tmpFunc;			// current member function
+Enum      *tmpEnum;			// current enum
+Access tmpAccess;			// current access permission
+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	   tmpPropOverride;		// current property override setting
+
+int	   tmpYYStart;			// Used to store the lexers current mode
+int	   tmpYYStart2;			// Used to store the lexers current mode
+					//  (if tmpYYStart is already used)
+
+// if the format revision changes, you MUST change it in ntqmetaobject.h too
+const int formatRevision = 26;		// moc output format revision
+
+// if the flags change, you HAVE to change it in ntqmetaobject.h too
 enum Flags  {
     Invalid		= 0x00000000,
     Readable		= 0x00000001,
@@ -637,9 +698,159 @@ extern "C" int hack_isatty( int )
 # define YYDEBUG 1
 # include "moc_yacc.h"
 # include "moc_lex.cpp"
-#endif /*YYBISON*/
-#line 689 "moc.y"
-typedef union {
+#endif //YYBISON
+
+
+/* Line 189 of yacc.c  */
+#line 706 "moc_yacc"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     CHAR_VAL = 258,
+     INT_VAL = 259,
+     DOUBLE_VAL = 260,
+     STRING = 261,
+     IDENTIFIER = 262,
+     FRIEND = 263,
+     TYPEDEF = 264,
+     AUTO = 265,
+     REGISTER = 266,
+     STATIC = 267,
+     EXTERN = 268,
+     INLINE = 269,
+     VIRTUAL = 270,
+     CONST = 271,
+     VOLATILE = 272,
+     CHAR = 273,
+     SHORT = 274,
+     INT = 275,
+     LONG = 276,
+     SIGNED = 277,
+     UNSIGNED = 278,
+     FLOAT = 279,
+     DOUBLE = 280,
+     VOID = 281,
+     ENUM = 282,
+     CLASS = 283,
+     STRUCT = 284,
+     UNION = 285,
+     ASM = 286,
+     PRIVATE = 287,
+     PROTECTED = 288,
+     PUBLIC = 289,
+     OPERATOR = 290,
+     DBL_COLON = 291,
+     TRIPLE_DOT = 292,
+     TEMPLATE = 293,
+     NAMESPACE = 294,
+     USING = 295,
+     MUTABLE = 296,
+     THROW = 297,
+     SIGNALS = 298,
+     SLOTS = 299,
+     TQ_OBJECT = 300,
+     Q_PROPERTY = 301,
+     Q_OVERRIDE = 302,
+     Q_CLASSINFO = 303,
+     Q_ENUMS = 304,
+     Q_SETS = 305,
+     READ = 306,
+     WRITE = 307,
+     STORED = 308,
+     DESIGNABLE = 309,
+     SCRIPTABLE = 310,
+     RESET = 311
+   };
+#endif
+/* Tokens.  */
+#define CHAR_VAL 258
+#define INT_VAL 259
+#define DOUBLE_VAL 260
+#define STRING 261
+#define IDENTIFIER 262
+#define FRIEND 263
+#define TYPEDEF 264
+#define AUTO 265
+#define REGISTER 266
+#define STATIC 267
+#define EXTERN 268
+#define INLINE 269
+#define VIRTUAL 270
+#define CONST 271
+#define VOLATILE 272
+#define CHAR 273
+#define SHORT 274
+#define INT 275
+#define LONG 276
+#define SIGNED 277
+#define UNSIGNED 278
+#define FLOAT 279
+#define DOUBLE 280
+#define VOID 281
+#define ENUM 282
+#define CLASS 283
+#define STRUCT 284
+#define UNION 285
+#define ASM 286
+#define PRIVATE 287
+#define PROTECTED 288
+#define PUBLIC 289
+#define OPERATOR 290
+#define DBL_COLON 291
+#define TRIPLE_DOT 292
+#define TEMPLATE 293
+#define NAMESPACE 294
+#define USING 295
+#define MUTABLE 296
+#define THROW 297
+#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 READ 306
+#define WRITE 307
+#define STORED 308
+#define DESIGNABLE 309
+#define SCRIPTABLE 310
+#define RESET 311
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 214 of yacc.c  */
+#line 692 "moc.y"
+
     char	char_val;
     int		int_val;
     double	double_val;
@@ -648,1003 +859,3579 @@ typedef union {
     Function   *function;
     ArgList    *arg_list;
     Argument   *arg;
+
+
+
+/* Line 214 of yacc.c  */
+#line 867 "moc_yacc"
 } YYSTYPE;
-#line 653 "y.tab.c"
-#define CHAR_VAL 257
-#define INT_VAL 258
-#define DOUBLE_VAL 259
-#define STRING 260
-#define IDENTIFIER 261
-#define FRIEND 262
-#define TYPEDEF 263
-#define AUTO 264
-#define REGISTER 265
-#define STATIC 266
-#define EXTERN 267
-#define INLINE 268
-#define VIRTUAL 269
-#define CONST 270
-#define VOLATILE 271
-#define CHAR 272
-#define SHORT 273
-#define INT 274
-#define LONG 275
-#define SIGNED 276
-#define UNSIGNED 277
-#define FLOAT 278
-#define DOUBLE 279
-#define VOID 280
-#define ENUM 281
-#define CLASS 282
-#define STRUCT 283
-#define UNION 284
-#define ASM 285
-#define PRIVATE 286
-#define PROTECTED 287
-#define PUBLIC 288
-#define OPERATOR 289
-#define DBL_COLON 290
-#define TRIPLE_DOT 291
-#define TEMPLATE 292
-#define NAMESPACE 293
-#define USING 294
-#define MUTABLE 295
-#define THROW 296
-#define SIGNALS 297
-#define SLOTS 298
-#define Q_OBJECT 299
-#define Q_PROPERTY 300
-#define Q_OVERRIDE 301
-#define Q_CLASSINFO 302
-#define Q_ENUMS 303
-#define Q_SETS 304
-#define READ 305
-#define WRITE 306
-#define STORED 307
-#define DESIGNABLE 308
-#define SCRIPTABLE 309
-#define RESET 310
-#define YYERRCODE 256
-short yylhs[] = {                                        -1,
-    0,    0,   40,   40,   40,   40,   40,   42,   42,   48,
-   50,   46,   51,   52,   47,   49,   43,   45,   44,   44,
-   54,   41,    1,    1,    2,   55,   56,   57,   58,   30,
-   30,   30,   30,   30,   29,   31,   31,   32,   32,   59,
-   59,   59,   59,   34,   34,   33,   33,   11,   11,   11,
-   12,   12,   13,   13,   13,   13,   13,   13,   13,   13,
-   13,    3,   60,   60,   14,   14,   15,   15,   16,   16,
-   17,   17,   17,   19,   19,   21,   21,   25,   25,   61,
-   61,   20,   20,   24,   62,   24,   24,   63,   24,   22,
-   22,   23,   64,   23,   65,   23,   23,   23,   35,   35,
-   66,   35,   35,   39,   67,   10,   10,   73,   10,   74,
-   10,   75,   72,   76,   72,   38,   38,   37,   37,   36,
-   36,   26,   26,   27,   27,   28,   28,   71,   71,   71,
-   78,   77,   81,   53,   53,   53,   53,   53,   53,   18,
-   18,   18,   18,   18,   82,   82,   79,   83,   69,   69,
-   84,   68,   68,   85,   86,   86,   88,   87,    4,    4,
-   80,   80,   89,   89,   91,   91,   93,   90,   94,   90,
-   90,   96,   99,   90,  100,  101,   90,  102,  103,   90,
-  104,  106,   90,  107,  109,   90,   92,   92,  111,   92,
-   92,   98,   98,  112,  112,  113,   95,   95,  115,  115,
-  116,  110,  110,  117,  117,  118,  119,  119,    5,    6,
-    6,    7,    7,    8,    8,    8,    8,    8,    8,    8,
-    8,    8,    8,    9,    9,    9,  120,  120,  120,  120,
-  120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-  120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-  120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-  120,  120,  120,  120,  120,  120,  120,  121,  121,  122,
-  122,  122,  122,  122,  122,  122,  122,  122,  122,  122,
-  122,  114,  114,  114,  114,  114,  114,  114,  114,  126,
-  127,  114,  124,  124,  128,  129,  128,  130,  128,  123,
-  131,  123,  125,  133,  133,  132,  132,   70,   70,  134,
-  134,  134,  135,  136,  135,  138,   97,  137,  137,  137,
-  137,  137,  137,  137,  105,  105,  108,  108,
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 264 of yacc.c  */
+#line 879 "moc_yacc"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include  /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include  /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int yyi)
+#else
+static int
+YYID (yyi)
+    int yyi;
+#endif
+{
+  return yyi;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include  /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include  /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include  /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include  /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  2
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   612
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  79
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  140
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  329
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  492
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   311
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    78,     2,     2,     2,    74,    69,     2,
+      66,    67,    68,    71,    63,    72,     2,    73,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    70,    60,
+      61,    59,    62,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    64,     2,    65,    75,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    57,    76,    58,    77,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
+      19,    21,    22,    23,    31,    32,    33,    40,    42,    48,
+      51,    54,    57,    58,    62,    64,    66,    71,    72,    73,
+      74,    75,    77,    79,    81,    83,    85,    89,    90,    92,
+      94,    97,    99,   101,   103,   105,   107,   109,   111,   113,
+     115,   117,   119,   122,   124,   126,   128,   130,   132,   134,
+     136,   138,   140,   142,   147,   148,   150,   153,   156,   158,
+     161,   165,   167,   170,   173,   176,   179,   183,   184,   186,
+     187,   189,   190,   192,   196,   198,   201,   202,   208,   213,
+     214,   222,   223,   225,   228,   229,   234,   235,   241,   243,
+     247,   249,   252,   253,   259,   263,   265,   274,   276,   279,
+     280,   285,   286,   292,   293,   298,   299,   305,   306,   308,
+     310,   313,   316,   319,   320,   322,   324,   327,   329,   331,
+     333,   335,   339,   340,   344,   345,   351,   353,   357,   361,
+     366,   369,   371,   373,   375,   377,   379,   382,   386,   389,
+     393,   394,   396,   401,   402,   404,   407,   409,   413,   414,
+     420,   421,   423,   424,   426,   429,   431,   433,   435,   436,
+     440,   441,   446,   448,   449,   450,   458,   459,   460,   468,
+     469,   470,   480,   481,   482,   490,   491,   492,   500,   503,
+     507,   508,   512,   514,   515,   517,   520,   522,   524,   525,
+     527,   530,   532,   534,   535,   537,   540,   542,   544,   545,
+     548,   551,   555,   557,   562,   567,   569,   573,   576,   580,
+     583,   585,   589,   592,   596,   599,   601,   603,   605,   609,
+     613,   615,   617,   619,   621,   623,   625,   627,   629,   631,
+     633,   635,   637,   639,   642,   645,   648,   651,   654,   657,
+     660,   663,   666,   669,   672,   675,   678,   681,   684,   688,
+     692,   695,   698,   701,   704,   706,   710,   713,   716,   719,
+     720,   722,   725,   727,   731,   737,   740,   744,   749,   753,
+     756,   763,   768,   774,   778,   783,   790,   795,   800,   806,
+     810,   814,   815,   816,   824,   826,   830,   832,   833,   838,
+     839,   843,   844,   845,   849,   852,   853,   855,   861,   866,
+     867,   869,   870,   872,   876,   878,   879,   884,   885,   890,
+     891,   895,   899,   903,   907,   911,   915,   916,   919,   920
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+      80,     0,    -1,    -1,    80,    81,    -1,    93,    -1,    82,
+      -1,    90,    -1,    92,    -1,    91,    -1,    83,    -1,    86,
+      -1,    -1,    -1,    39,     7,    84,    57,    85,    89,    58,
+      -1,    -1,    -1,    39,    87,    57,    88,    89,    58,    -1,
+      80,    -1,    39,     7,    59,   114,    60,    -1,    40,    39,
+      -1,    40,     7,    -1,    40,    36,    -1,    -1,    94,   148,
+      60,    -1,     7,    -1,    96,    -1,     7,    61,    97,    62,
+      -1,    -1,    -1,    -1,    -1,   105,    -1,   107,    -1,   106,
+      -1,     8,    -1,     9,    -1,   103,   108,   103,    -1,    -1,
+     104,    -1,   101,    -1,   104,   101,    -1,    10,    -1,    11,
+      -1,    12,    -1,    13,    -1,    14,    -1,    15,    -1,    16,
+      -1,    17,    -1,   116,    -1,   114,    -1,   109,    -1,   109,
+     110,    -1,   110,    -1,    18,    -1,    19,    -1,    20,    -1,
+      21,    -1,    22,    -1,    23,    -1,    24,    -1,    25,    -1,
+      26,    -1,    38,    61,    97,    62,    -1,    -1,   111,    -1,
+     112,    28,    -1,   112,    29,    -1,   115,    -1,    36,   115,
+      -1,   115,    36,    95,    -1,    95,    -1,   113,     7,    -1,
+      27,     7,    -1,    30,     7,    -1,   118,   120,    -1,   121,
+      63,    37,    -1,    -1,   121,    -1,    -1,   122,    -1,    -1,
+      37,    -1,   121,    63,   122,    -1,   122,    -1,   102,   125,
+      -1,    -1,   102,   125,    59,   123,    99,    -1,   102,   125,
+     131,   125,    -1,    -1,   102,   125,   131,   125,    59,   124,
+      99,    -1,    -1,   126,    -1,   126,   141,    -1,    -1,    64,
+     127,    98,    65,    -1,    -1,   126,    64,   128,    98,    65,
+      -1,   141,    -1,    66,   126,    67,    -1,   131,    -1,   129,
+     141,    -1,    -1,   129,    64,   130,    98,    65,    -1,    66,
+     129,    67,    -1,     7,    -1,    66,   117,    67,   142,   156,
+     154,   210,   145,    -1,     7,    -1,     7,   136,    -1,    -1,
+       7,    59,   134,    98,    -1,    -1,     7,   136,    59,   135,
+      98,    -1,    -1,    64,   137,    98,    65,    -1,    -1,   136,
+      64,   138,    98,    65,    -1,    -1,   140,    -1,   141,    -1,
+     140,   141,    -1,    68,   142,    -1,    69,   142,    -1,    -1,
+     143,    -1,   144,    -1,   143,   144,    -1,    16,    -1,    17,
+      -1,    60,    -1,   146,    -1,    59,     4,    60,    -1,    -1,
+      57,   147,    58,    -1,    -1,   152,    57,   149,   162,    58,
+      -1,   151,    -1,   151,    68,     7,    -1,   151,    69,     7,
+      -1,   151,    66,     7,    67,    -1,   111,   150,    -1,     7,
+      -1,   110,    -1,   107,    -1,   105,    -1,   106,    -1,   113,
+     115,    -1,   113,     7,    95,    -1,   151,   161,    -1,   113,
+     115,   161,    -1,    -1,   155,    -1,    42,    66,   119,    67,
+      -1,    -1,   157,    -1,    70,   158,    -1,   159,    -1,   159,
+      63,   158,    -1,    -1,   114,    66,   160,    98,    67,    -1,
+      -1,   190,    -1,    -1,   163,    -1,   163,   165,    -1,   165,
+      -1,   194,    -1,    44,    -1,    -1,   164,   166,   178,    -1,
+      -1,    43,   167,    70,   183,    -1,    45,    -1,    -1,    -1,
+      46,   168,    66,   214,    67,   169,   180,    -1,    -1,    -1,
+      47,   170,    66,   214,    67,   171,   180,    -1,    -1,    -1,
+      48,   172,    66,     6,    63,     6,    67,   173,   180,    -1,
+      -1,    -1,    49,   174,    66,   217,    67,   175,   180,    -1,
+      -1,    -1,    50,   176,    66,   218,    67,   177,   180,    -1,
+      43,    70,    -1,    44,    70,   186,    -1,    -1,    70,   179,
+     180,    -1,     7,    -1,    -1,   181,    -1,   181,   182,    -1,
+     182,    -1,   198,    -1,    -1,   184,    -1,   184,   185,    -1,
+     185,    -1,   198,    -1,    -1,   187,    -1,   187,   188,    -1,
+     188,    -1,   198,    -1,    -1,   189,    60,    -1,    70,   191,
+      -1,   191,    63,   193,    -1,   193,    -1,     7,    66,     7,
+      67,    -1,     7,    66,   110,    67,    -1,   114,    -1,    15,
+     194,   114,    -1,    15,   114,    -1,   194,    15,   114,    -1,
+     194,   114,    -1,   192,    -1,    15,   194,   192,    -1,    15,
+     192,    -1,   194,    15,   192,    -1,   194,   192,    -1,    32,
+      -1,    33,    -1,    34,    -1,   103,     7,   139,    -1,   103,
+     110,   139,    -1,    71,    -1,    72,    -1,    68,    -1,    73,
+      -1,    74,    -1,    75,    -1,    69,    -1,    76,    -1,    77,
+      -1,    78,    -1,    59,    -1,    61,    -1,    62,    -1,    71,
+      59,    -1,    72,    59,    -1,    68,    59,    -1,    73,    59,
+      -1,    74,    59,    -1,    75,    59,    -1,    69,    59,    -1,
+      76,    59,    -1,    77,    59,    -1,    78,    59,    -1,    59,
+      59,    -1,    61,    59,    -1,    62,    59,    -1,    61,    61,
+      -1,    62,    62,    -1,    61,    61,    59,    -1,    62,    62,
+      59,    -1,    69,    69,    -1,    76,    76,    -1,    71,    71,
+      -1,    72,    72,    -1,    63,    -1,    72,    62,    68,    -1,
+      72,    62,    -1,    66,    67,    -1,    64,    65,    -1,    -1,
+      15,    -1,   108,   133,    -1,   133,    -1,   196,    77,   133,
+      -1,   104,   108,   103,   139,   133,    -1,   104,   108,    -1,
+     108,   140,   133,    -1,   108,   104,   139,   133,    -1,   108,
+      35,   195,    -1,    35,   195,    -1,   104,   108,   103,   139,
+      35,   195,    -1,   108,   140,    35,   195,    -1,   108,   104,
+     139,    35,   195,    -1,   197,   132,   189,    -1,   197,   205,
+      60,   189,    -1,   197,   205,    63,   201,    60,   189,    -1,
+     207,   210,    60,   189,    -1,    40,   114,    60,   189,    -1,
+      40,    39,   114,    60,   189,    -1,    39,     7,    57,    -1,
+     153,    60,   189,    -1,    -1,    -1,   153,    57,   199,    58,
+     200,    60,   189,    -1,   202,    -1,   201,    63,   202,    -1,
+     129,    -1,    -1,     7,    70,   203,    98,    -1,    -1,    70,
+     204,    98,    -1,    -1,    -1,    70,   206,    98,    -1,    27,
+     209,    -1,    -1,    63,    -1,     7,    57,   211,   208,    58,
+      -1,    57,   211,   208,    58,    -1,    -1,     7,    -1,    -1,
+     212,    -1,   211,    63,   212,    -1,     7,    -1,    -1,     7,
+      59,   213,   100,    -1,    -1,     7,     7,   215,   216,    -1,
+      -1,    51,     7,   216,    -1,    52,     7,   216,    -1,    56,
+       7,   216,    -1,    53,     7,   216,    -1,    54,     7,   216,
+      -1,    55,     7,   216,    -1,    -1,     7,   217,    -1,    -1,
+       7,   218,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   807,   807,   808,   811,   813,   814,   815,   816,   819,
+     820,   824,   825,   823,   832,   833,   832,   840,   843,   848,
+     851,   852,   855,   855,   864,   865,   868,   880,   893,   902,
+     905,   911,   912,   913,   914,   915,   918,   921,   922,   925,
+     926,   929,   930,   931,   932,   935,   936,   939,   940,   943,
+     944,   945,   948,   950,   953,   954,   955,   956,   957,   958,
+     959,   960,   961,   964,   970,   971,   977,   978,   981,   982,
+     986,   988,   992,   993,   994,   999,  1000,  1006,  1007,  1010,
+    1011,  1014,  1015,  1021,  1024,  1027,  1030,  1029,  1033,  1038,
+    1036,  1044,  1045,  1048,  1050,  1050,  1055,  1055,  1060,  1061,
+    1064,  1065,  1067,  1067,  1072,  1075,  1078,  1090,  1091,  1093,
+    1093,  1096,  1096,  1102,  1102,  1104,  1104,  1109,  1110,  1113,
+    1114,  1117,  1118,  1125,  1126,  1129,  1130,  1134,  1135,  1138,
+    1139,  1140,  1143,  1143,  1151,  1150,  1156,  1158,  1160,  1162,
+    1166,  1170,  1171,  1172,  1173,  1174,  1178,  1183,  1191,  1195,
+    1200,  1201,  1205,  1208,  1209,  1212,  1215,  1216,  1220,  1220,
+    1225,  1226,  1229,  1230,  1233,  1234,  1238,  1239,  1243,  1243,
+    1245,  1245,  1247,  1255,  1258,  1255,  1262,  1265,  1262,  1269,
+    1271,  1269,  1276,  1277,  1276,  1282,  1283,  1282,  1290,  1292,
+    1293,  1293,  1303,  1310,  1311,  1314,  1315,  1318,  1321,  1322,
+    1325,  1326,  1330,  1333,  1334,  1337,  1338,  1341,  1344,  1345,
+    1348,  1351,  1352,  1355,  1357,  1361,  1362,  1363,  1364,  1365,
+    1366,  1367,  1368,  1369,  1370,  1373,  1374,  1375,  1378,  1379,
+    1380,  1381,  1382,  1383,  1384,  1385,  1386,  1387,  1388,  1389,
+    1390,  1391,  1392,  1393,  1394,  1395,  1396,  1397,  1398,  1399,
+    1400,  1401,  1402,  1403,  1404,  1405,  1406,  1407,  1408,  1409,
+    1410,  1411,  1412,  1413,  1414,  1415,  1416,  1417,  1418,  1422,
+    1423,  1426,  1429,  1436,  1443,  1451,  1453,  1457,  1462,  1464,
+    1466,  1469,  1471,  1477,  1478,  1480,  1483,  1485,  1487,  1489,
+    1492,  1495,  1498,  1494,  1503,  1504,  1507,  1508,  1508,  1510,
+    1510,  1514,  1515,  1515,  1520,  1525,  1526,  1529,  1536,  1540,
+    1541,  1544,  1545,  1546,  1549,  1550,  1550,  1555,  1554,  1591,
+    1592,  1593,  1594,  1595,  1596,  1597,  1600,  1601,  1604,  1605
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "CHAR_VAL", "INT_VAL", "DOUBLE_VAL",
+  "STRING", "IDENTIFIER", "FRIEND", "TYPEDEF", "AUTO", "REGISTER",
+  "STATIC", "EXTERN", "INLINE", "VIRTUAL", "CONST", "VOLATILE", "CHAR",
+  "SHORT", "INT", "LONG", "SIGNED", "UNSIGNED", "FLOAT", "DOUBLE", "VOID",
+  "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",
+  "WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", "'}'",
+  "'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", "'*'",
+  "'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", "'!'",
+  "$accept", "declaration_seq", "declaration", "namespace_def",
+  "named_namespace_def", "$@1", "$@2", "unnamed_namespace_def", "$@3",
+  "$@4", "namespace_body", "namespace_alias_def", "using_directive",
+  "using_declaration", "class_def", "$@5", "class_name",
+  "template_class_name", "template_args", "const_expression",
+  "def_argument", "enumerator_expression", "decl_specifier",
+  "decl_specifiers", "decl_specs_opt", "decl_specs",
+  "storage_class_specifier", "fct_specifier", "type_specifier",
+  "type_name", "simple_type_names", "simple_type_name", "template_spec",
+  "opt_template_spec", "class_key", "complete_class_name",
+  "qualified_class_name", "elaborated_type_specifier",
+  "argument_declaration_list", "arg_declaration_list_opt",
+  "opt_exception_argument", "triple_dot_opt", "arg_declaration_list",
+  "argument_declaration", "$@6", "$@7", "abstract_decl_opt",
+  "abstract_decl", "$@8", "$@9", "declarator", "$@10", "dname", "fct_decl",
+  "fct_name", "$@11", "$@12", "array_decls", "$@13", "$@14",
+  "ptr_operators_opt", "ptr_operators", "ptr_operator",
+  "cv_qualifier_list_opt", "cv_qualifier_list", "cv_qualifier",
+  "fct_body_or_semicolon", "fct_body", "$@15", "class_specifier", "$@16",
+  "whatever", "class_head", "full_class_head", "nested_class_head",
+  "exception_spec_opt", "exception_spec", "ctor_initializer_opt",
+  "ctor_initializer", "mem_initializer_list", "mem_initializer", "$@17",
+  "opt_base_spec", "opt_obj_member_list", "obj_member_list",
+  "qt_access_specifier", "obj_member_area", "$@18", "$@19", "$@20", "$@21",
+  "$@22", "$@23", "$@24", "$@25", "$@26", "$@27", "$@28", "$@29",
+  "slot_area", "$@30", "opt_property_candidates",
+  "property_candidate_declarations", "property_candidate_declaration",
+  "opt_signal_declarations", "signal_declarations", "signal_declaration",
+  "opt_slot_declarations", "slot_declarations", "slot_declaration",
+  "opt_semicolons", "base_spec", "base_list", "qt_macro_name",
+  "base_specifier", "access_specifier", "operator_name", "opt_virtual",
+  "type_and_name", "signal_or_slot", "$@31", "$@32",
+  "member_declarator_list", "member_declarator", "$@33", "$@34",
+  "opt_bitfield", "$@35", "enum_specifier", "opt_komma", "enum_tail",
+  "opt_identifier", "enum_list", "enumerator", "$@36", "property", "$@37",
+  "prop_statements", "qt_enums", "qt_sets", 0
 };
-short yylen[] = {                                         2,
-    0,    2,    1,    1,    1,    1,    1,    1,    1,    0,
-    0,    7,    0,    0,    6,    1,    5,    2,    2,    2,
-    0,    3,    1,    1,    4,    0,    0,    0,    0,    1,
-    1,    1,    1,    1,    3,    0,    1,    1,    2,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    2,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    4,    0,    1,    2,    2,    1,    2,    3,    1,
-    2,    2,    2,    2,    3,    0,    1,    0,    1,    0,
-    1,    3,    1,    2,    0,    5,    4,    0,    7,    0,
-    1,    2,    0,    4,    0,    5,    1,    3,    1,    2,
-    0,    5,    3,    1,    8,    1,    2,    0,    4,    0,
-    5,    0,    4,    0,    5,    0,    1,    1,    2,    2,
-    2,    0,    1,    1,    2,    1,    1,    1,    1,    3,
-    0,    3,    0,    5,    1,    3,    3,    4,    2,    1,
-    1,    1,    1,    1,    2,    3,    2,    3,    0,    1,
-    4,    0,    1,    2,    1,    3,    0,    5,    0,    1,
-    0,    1,    2,    1,    1,    1,    0,    3,    0,    4,
-    1,    0,    0,    7,    0,    0,    7,    0,    0,    9,
-    0,    0,    7,    0,    0,    7,    2,    3,    0,    3,
-    1,    0,    1,    2,    1,    1,    0,    1,    2,    1,
-    1,    0,    1,    2,    1,    1,    0,    2,    2,    3,
-    1,    4,    4,    1,    3,    2,    3,    2,    1,    3,
-    2,    3,    2,    1,    1,    1,    3,    3,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,    2,    2,
-    2,    2,    1,    3,    2,    2,    2,    0,    1,    2,
-    1,    3,    5,    2,    3,    4,    3,    2,    6,    4,
-    5,    3,    4,    6,    4,    4,    5,    3,    3,    0,
-    0,    7,    1,    3,    1,    0,    4,    0,    3,    0,
-    0,    3,    2,    0,    1,    5,    4,    0,    1,    0,
-    1,    3,    1,    0,    4,    0,    4,    0,    3,    3,
-    3,    3,    3,    3,    0,    2,    0,    2,
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   123,   125,    61,
+      59,    60,    62,    44,    91,    93,    40,    41,    42,    38,
+      58,    43,    45,    47,    37,    94,   124,   126,    33
 };
-short yydefred[] = {                                      1,
-    0,    0,    0,    2,    3,    4,    5,    6,    7,    8,
-    9,    0,    0,    0,   19,   20,   18,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   14,   26,  140,   40,
-   41,   42,   43,   44,   45,   46,   47,   53,   54,   55,
-   56,   57,   58,   59,   60,   61,  141,  139,  142,  144,
-  143,    0,   70,   24,    0,   22,   65,   66,  133,    0,
-    0,    0,    0,  147,  160,    0,    0,    0,    0,   11,
-    1,    0,   26,  146,    0,    0,    0,  136,  137,    0,
-    0,  224,  225,  226,    0,  219,  211,    0,  214,    0,
-   17,    1,    0,    0,   62,    0,   69,  169,  166,  171,
-  172,  175,  178,  181,  184,  165,    0,    0,  164,  167,
-  138,    0,  221,    0,  216,    0,    0,  223,  218,    0,
-   15,   25,    0,    0,    0,    0,    0,    0,  134,  163,
-    0,    0,    0,  220,  215,  210,  222,  217,   12,    0,
-    0,    0,    0,    0,    0,  191,    0,    0,  189,  168,
-  212,  213,    0,   33,   34,    0,    0,    0,    0,    0,
-    0,   64,  271,    0,    0,   52,    0,   49,   48,   38,
-    0,   31,   32,   30,    0,  170,  201,    0,  200,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  187,    0,    0,  108,  112,    0,    0,    0,  303,   73,
-    0,    0,    0,  263,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  278,    0,
-    0,    0,    0,    0,    0,    0,  270,    0,  118,    0,
-   51,    0,    0,    0,    0,    0,   39,  290,  207,  199,
-    0,    0,  301,  207,    0,  309,    0,  316,  173,  176,
-    0,  326,  182,  328,  185,  188,  206,    0,  205,  190,
-    0,  195,  196,   27,   27,  110,  114,    0,    0,    0,
-  311,  252,  253,    0,  254,    0,  267,  266,  244,  248,
-  259,  242,  261,  243,    0,  262,  245,  246,  247,  249,
-  260,  250,  251,    0,    0,  288,    0,  207,  277,  126,
-  127,  120,    0,  124,  121,    0,    0,    0,  275,  119,
-  148,   72,    0,   71,    0,    0,  272,    0,    0,    0,
-   83,    0,    0,   27,    0,  207,    0,  207,    0,    0,
-    0,    0,    0,    0,  204,  194,  109,    0,   27,   27,
-    0,  314,    0,    0,  257,  258,  264,  227,  228,  207,
-    0,  125,    0,  276,  280,    0,  291,  208,    0,    0,
-   81,   74,   93,    0,    0,    0,   97,    0,  302,    0,
-    0,    0,  298,    0,   99,    0,  293,    0,    0,    0,
-    0,    0,    0,    0,  317,  174,  177,  179,  183,  186,
-  113,  111,    0,    0,   29,  312,  307,    0,  281,    0,
-  273,    0,    0,   75,   82,   27,    0,  104,   85,    0,
-   95,   92,   35,  296,    0,   27,  101,  100,  207,    0,
-    0,    0,    0,    0,    0,    0,    0,  115,  306,  315,
-  279,  207,    0,    0,  153,    0,   98,   28,    0,   27,
-   27,  103,  299,   27,    0,  294,  319,  320,  322,  323,
-  324,  321,  180,    0,    0,  154,    0,    0,    0,  150,
-   94,   86,   88,    0,  297,    0,  157,    0,    0,    0,
-   28,   96,  102,   27,  156,   79,    0,  131,    0,  128,
-  105,  129,   89,    0,  151,    0,    0,  158,  132,  130,
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    79,    80,    80,    81,    81,    81,    81,    81,    82,
+      82,    84,    85,    83,    87,    88,    86,    89,    90,    91,
+      92,    92,    94,    93,    95,    95,    96,    97,    98,    99,
+     100,   101,   101,   101,   101,   101,   102,   103,   103,   104,
+     104,   105,   105,   105,   105,   106,   106,   107,   107,   108,
+     108,   108,   109,   109,   110,   110,   110,   110,   110,   110,
+     110,   110,   110,   111,   112,   112,   113,   113,   114,   114,
+     115,   115,   116,   116,   116,   117,   117,   118,   118,   119,
+     119,   120,   120,   121,   121,   122,   123,   122,   122,   124,
+     122,   125,   125,   126,   127,   126,   128,   126,   126,   126,
+     129,   129,   130,   129,   129,   131,   132,   133,   133,   134,
+     133,   135,   133,   137,   136,   138,   136,   139,   139,   140,
+     140,   141,   141,   142,   142,   143,   143,   144,   144,   145,
+     145,   145,   147,   146,   149,   148,   148,   148,   148,   148,
+     148,   150,   150,   150,   150,   150,   151,   151,   152,   153,
+     154,   154,   155,   156,   156,   157,   158,   158,   160,   159,
+     161,   161,   162,   162,   163,   163,   164,   164,   166,   165,
+     167,   165,   165,   168,   169,   165,   170,   171,   165,   172,
+     173,   165,   174,   175,   165,   176,   177,   165,   178,   178,
+     179,   178,   178,   180,   180,   181,   181,   182,   183,   183,
+     184,   184,   185,   186,   186,   187,   187,   188,   189,   189,
+     190,   191,   191,   192,   192,   193,   193,   193,   193,   193,
+     193,   193,   193,   193,   193,   194,   194,   194,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+     195,   195,   195,   195,   195,   195,   195,   195,   195,   196,
+     196,   197,   197,   197,   197,   197,   197,   197,   197,   197,
+     197,   197,   197,   198,   198,   198,   198,   198,   198,   198,
+     198,   199,   200,   198,   201,   201,   202,   203,   202,   204,
+     202,   205,   206,   205,   207,   208,   208,   209,   209,   210,
+     210,   211,   211,   211,   212,   213,   212,   215,   214,   216,
+     216,   216,   216,   216,   216,   216,   217,   217,   218,   218
 };
-short yydgoto[] = {                                      93,
-   53,   54,  162,   64,   65,   85,   86,   87,   88,  163,
-  164,  165,  166,  167,  168,   69,  169,   48,  318,  319,
-  320,  365,  366,  321,  477,  302,  303,  304,  322,  170,
-  217,  171,  172,  173,  374,  229,  306,  307,  375,    4,
-    5,    6,    7,    8,    9,   10,   11,   26,   94,   92,
-   14,   71,   21,   12,   72,  337,  462,  430,  174,   22,
-  362,  438,  471,  406,  440,  444,  244,  434,  459,  247,
-  481,  196,  264,  339,  265,  340,  482,  486,   23,  107,
-   76,   24,  175,  460,  435,  456,  457,  474,  108,  109,
-  110,  150,  131,  123,  176,  124,  184,  260,  330,  125,
-  331,  126,  427,  127,  188,  333,  128,  190,  334,  256,
-  193,  261,  262,  263,  178,  179,  258,  259,  316,  219,
-  180,  181,  245,  376,  182,  315,  402,  377,  441,  416,
-  324,  199,  344,  270,  271,  395,  385,  329,
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
+       1,     0,     0,     7,     0,     0,     6,     1,     5,     2,
+       2,     2,     0,     3,     1,     1,     4,     0,     0,     0,
+       0,     1,     1,     1,     1,     1,     3,     0,     1,     1,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     4,     0,     1,     2,     2,     1,     2,
+       3,     1,     2,     2,     2,     2,     3,     0,     1,     0,
+       1,     0,     1,     3,     1,     2,     0,     5,     4,     0,
+       7,     0,     1,     2,     0,     4,     0,     5,     1,     3,
+       1,     2,     0,     5,     3,     1,     8,     1,     2,     0,
+       4,     0,     5,     0,     4,     0,     5,     0,     1,     1,
+       2,     2,     2,     0,     1,     1,     2,     1,     1,     1,
+       1,     3,     0,     3,     0,     5,     1,     3,     3,     4,
+       2,     1,     1,     1,     1,     1,     2,     3,     2,     3,
+       0,     1,     4,     0,     1,     2,     1,     3,     0,     5,
+       0,     1,     0,     1,     2,     1,     1,     1,     0,     3,
+       0,     4,     1,     0,     0,     7,     0,     0,     7,     0,
+       0,     9,     0,     0,     7,     0,     0,     7,     2,     3,
+       0,     3,     1,     0,     1,     2,     1,     1,     0,     1,
+       2,     1,     1,     0,     1,     2,     1,     1,     0,     2,
+       2,     3,     1,     4,     4,     1,     3,     2,     3,     2,
+       1,     3,     2,     3,     2,     1,     1,     1,     3,     3,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     3,     3,
+       2,     2,     2,     2,     1,     3,     2,     2,     2,     0,
+       1,     2,     1,     3,     5,     2,     3,     4,     3,     2,
+       6,     4,     5,     3,     4,     6,     4,     4,     5,     3,
+       3,     0,     0,     7,     1,     3,     1,     0,     4,     0,
+       3,     0,     0,     3,     2,     0,     1,     5,     4,     0,
+       1,     0,     1,     3,     1,     0,     4,     0,     4,     0,
+       3,     3,     3,     3,     3,     3,     0,     2,     0,     2
 };
-short yysindex[] = {                                      0,
-   70, -206, -111,    0,    0,    0,    0,    0,    0,    0,
-    0, -220,   41,   10,    0,    0,    0,   67,  912,  -96,
-  152,  124,   91,  559,  -81,   98,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   11,    0,    0,  -54,    0,    0,    0,    0,  -14,
-   -3,   59,  354,    0,    0,  201,   61,  233,  -54,    0,
-    0,  266,    0,    0,   61, 1186,  329,    0,    0,  206,
-  245,    0,    0,    0,  328,    0,    0,  -83,    0,  -54,
-    0,    0,   70,  287,    0,  348,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  295, 1186,    0,    0,
-    0,  438,    0,  -66,    0,  354,  -66,    0,    0,  303,
-    0,    0,  384,  406,  411,  457,  468,  480,    0,    0,
-  -42,  434,  481,    0,    0,    0,    0,    0,    0, 1064,
-  265,  265,  291,  292,  306,    0,  506,  515,    0,    0,
-    0,    0,  353,    0,    0,    0,  -71,  315,  467,  337,
-  -48,    0,    0,  276, 1230,    0,  374,    0,    0,    0,
- 1098,    0,    0,    0,  -26,    0,    0, 1064,    0,  436,
-  119,  375,  377,  568,  575,  545,  292,  604,  306,  607,
-    0, 1064, 1064,    0,    0,  -30,  520,  389,    0,    0,
-  596,  393,  394,    0,  570,  624,  600,  177,  355,  379,
-  605,  606,  609,   22,  612,  613,  986, 1229,    0,  572,
-  -81,  635,   13,  467,  349,  349,    0,  363,    0,  -36,
-    0,  201,  -53,  440, 1229,  441,    0,    0,    0,    0,
-  443, 1229,    0,    0,  204,    0,  649,    0,    0,    0,
-  463,    0,    0,    0,    0,    0,    0, 1064,    0,    0,
- 1064,    0,    0,    0,    0,    0,    0,  389,  664,  665,
-    0,    0,    0,  702,    0,  708,    0,    0,    0,    0,
-    0,    0,    0,    0,  626,    0,    0,    0,    0,    0,
-    0,    0,    0,  285,  285,    0,  667,    0,    0,    0,
-    0,    0,  349,    0,    0,  285, -201,  467,    0,    0,
-    0,    0,  285,    0,  599,  724,    0,  743,  742,  494,
-    0,  277, 1119,    0,  724,    0,  -21,    0,  764, 1064,
- 1064,  746, 1064, 1064,    0,    0,    0,  719,    0,    0,
-  665,    0,  389,  693,    0,    0,    0,    0,    0,    0,
-  724,    0,  467,    0,    0,  -38,    0,    0,  349,  784,
-    0,    0,    0,  277,  -22,  178,    0, 1229,    0,  724,
-  798,   29,    0,  407,    0,  458,    0,  724,  601,  617,
-  622,  625,  646,  647,    0,    0,    0,    0,    0,    0,
-    0,    0,  786,  762,    0,    0,    0,  724,    0,  467,
-    0,  874,  881,    0,    0,    0,   65,    0,    0,  277,
-    0,    0,    0,    0,  385,    0,    0,    0,    0,  -21,
-  764,  764,  764,  764,  764,  764, 1064,    0,    0,    0,
-    0,    0,  -81,  657,    0,  861,    0,    0,  894,    0,
-    0,    0,    0,    0,  724,    0,    0,    0,    0,    0,
-    0,    0,    0,  724,  916,    0,  913,  948,  375,    0,
-    0,    0,    0,  889,    0,  933,    0,  -81, 1229,   26,
-    0,    0,    0,    0,    0,    0,  991,    0,  799,    0,
-    0,    0,    0, 1015,    0,  936, 1004,    0,    0,    0,
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint16 yydefact[] =
+{
+       2,    22,     1,    14,     0,     3,     5,     9,    10,     6,
+       8,     7,     4,    64,    11,     0,    20,    21,    19,     0,
+      65,     0,     0,     0,   136,     0,     0,     0,    15,    27,
+     141,    41,    42,    43,    44,    45,    46,    47,    48,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,   144,   145,
+     143,   142,   140,    66,    67,    24,    71,    25,   146,    23,
+       0,     0,     0,     0,   148,   161,   134,    24,     0,     0,
+      68,    12,     2,     0,    27,   147,     0,     0,   137,   138,
+      24,     0,   225,   226,   227,   215,   210,   220,   212,     0,
+     162,    69,    18,     2,    22,     0,    63,     0,    70,   139,
+       0,   217,   222,     0,     0,     0,   219,   224,   170,   167,
+     172,   173,   176,   179,   182,   185,     0,   163,   168,   165,
+     166,     0,    16,    26,     0,     0,   216,   221,   211,   218,
+     223,     0,     0,     0,     0,     0,     0,   135,   164,     0,
+      13,   213,   214,   198,     0,     0,     0,   326,   328,   192,
+       0,     0,   190,   169,    24,    34,    35,    46,     0,     0,
+      37,     0,     0,    39,    64,    31,    33,    32,     0,    51,
+      53,    65,     0,    50,    49,   272,     0,   171,   199,   201,
+       0,   301,   202,   309,     0,     0,     0,     0,   326,     0,
+     328,     0,   188,   203,   193,   109,   113,   108,    73,   311,
+     304,    74,   240,   241,   242,   264,     0,     0,   232,   236,
+     230,   231,   233,   234,   235,   237,   238,   239,     0,    38,
+     279,     0,     0,     0,     0,    40,    37,     0,   107,    37,
+     123,   123,   117,   271,     0,   119,    52,    72,   160,   291,
+     208,   200,     0,    37,   302,   208,     0,   310,     0,   317,
+     174,   177,     0,   327,   183,   329,   186,   189,   204,   206,
+     207,   191,   194,   196,   197,    28,    28,   111,   115,   311,
+     314,   305,   312,   253,   254,   256,   255,   257,   268,   267,
+     245,   249,   260,   243,   262,   244,   266,   263,   246,   247,
+     248,   250,   261,   251,   252,   117,   117,   289,     0,   208,
+      73,   117,    72,   278,   127,   128,   121,   124,   125,   122,
+       0,   118,    37,   276,   120,   149,     0,   290,   273,    91,
+      64,     0,    81,    78,    84,    28,   283,   208,     0,   208,
+     319,   193,   193,     0,   193,   193,   205,   195,   110,     0,
+      28,    28,   305,   315,   306,     0,   258,   259,   265,   228,
+     229,   208,   287,     0,   126,    37,   277,   281,   292,   209,
+      94,     0,    85,    92,    98,    37,   123,    82,    75,    37,
+     303,   284,   105,     0,   299,   296,   100,     0,   294,   286,
+       0,     0,     0,     0,     0,     0,   318,   175,   178,   180,
+     184,   187,   114,   112,     0,     0,    30,   313,   308,   288,
+      37,   274,   282,     0,    28,     0,   105,    86,    91,    96,
+      93,    36,   153,    76,    83,   297,     0,    28,   102,   101,
+     208,     0,   319,   319,   319,   319,   319,   319,   193,   116,
+     307,   316,   280,   208,     0,    99,    29,    88,    28,     0,
+     150,   154,    28,   104,   300,    28,   285,   295,   320,   321,
+     323,   324,   325,   322,   181,   293,    95,    87,    89,     0,
+       0,   155,   156,     0,   309,   151,   298,     0,    29,    97,
+     158,     0,    37,     0,   103,    90,    28,   157,     0,    80,
+     132,     0,   129,   106,   130,     0,   152,     0,     0,   159,
+     133,   131
 };
-short yyrindex[] = {                                      0,
-  330,  941,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  199,  943,    0,    0,    0,    0,    0,  373,    0,
-    0,    0,    0,    5,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   76,    0,    0,  327,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   40,    0,    0,   71,    0,
-    0,    0,    0,    0,    0,  940,    0,    0,    0,   31,
-    0,    0,    0,    0,   78,    0,    0,    0,    0,   82,
-    0,    0,  -90,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  953,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  594,
-    0,    0,    0, 1062, 1068,    0,    0,    0,    0,    0,
-    0,    0,  113,    0,    0, 1032,    0,    0, 1140,    0,
-    0,    0,    0,    0,  126,    0,    0,    0,    0,    0,
-  199,    0,    0,    0,    0,    0,    0,  602,    0,    0,
-  504, 1065,    0,    0,    0,    0, 1062,    0, 1068,    0,
-    0,  911,  934,    0,    0,  516,  316,   33,    0,    0,
-  548,  618,  620,    0,    0,    0,  663, 1018, 1160, 1209,
- 1364, 1366, 1386, 1388, 1391, 1393,    0,    4,    0,    0,
-    0,    0, 1396, 1140,  -18,  -18,    0,   37,    0,    0,
-    0,  168,   80,    0,  191,    0,    0,    0,    0,    0,
-    0,  187,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  942,    0,    0,
-  988,    0,    0,    0,    0,    0,    0,   33,   49,  998,
-    0,    0,    0, 1398,    0, 1418,    0,    0,    0,    0,
-    0,    0,    0,    0, 1420,    0,    0,    0,    0,    0,
-    0,    0,    0, 1423, 1423,    0,    0,    0,    0,    0,
-    0,    0,  -29,    0,    0,  360,    0, 1140,    0,    0,
-    0,    0,   37,    0,    0,  478,    0,    0,  -37, 1084,
-    0,  -27,  199,    0,  527,    0,    0,    0, 1085,  934,
-  934,    0,  934,  934,    0,    0,    0,    0,    0,    0,
-  998,    0, 1002,    0,    0,    0,    0,    0,    0,    0,
-  571,    0, 1140,    0,    0,    0,    0,    0,  298,  408,
-    0,    0,    0,    0,  -23,   64,    0,    9,    0,  648,
-  477,    0,    0,  510,    0,    0,    0,  697,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  741,    0, 1140,
-    0,    0,  238,    0,    0,    0,    0,    0,    0,  -34,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- 1085, 1085, 1085, 1085, 1085, 1085,  934,    0,    0,    0,
-    0,    0,    0,   -2,    0,    0,    0,    0,  -16,    0,
-    0,    0,    0,    0,  818,    0,    0,    0,    0,    0,
-    0,    0,    0,  867,    0,    0,  350,    0,   58,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  211,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    94,     5,     6,     7,    27,    93,     8,    15,    72,
+      95,     9,    10,    11,    12,    13,    56,    57,    73,   338,
+     457,   431,   163,   319,   218,   164,   165,   166,   167,   168,
+     169,   170,   171,    21,   172,   173,    70,   174,   321,   322,
+     478,   368,   323,   324,   436,   468,   362,   363,   404,   438,
+     375,   445,   376,   245,   175,   265,   340,   197,   266,   341,
+     310,   311,   235,   306,   307,   308,   483,   484,   487,    23,
+      90,    52,    24,    25,   176,   464,   465,   440,   441,   461,
+     462,   476,    64,   116,   117,   118,   119,   139,   131,   132,
+     331,   133,   332,   134,   428,   135,   334,   136,   335,   153,
+     194,   261,   262,   263,   177,   178,   179,   257,   258,   259,
+     317,    65,    86,    87,    88,    89,   220,   180,   181,   264,
+     316,   403,   377,   378,   442,   417,   246,   325,   183,   345,
+     200,   248,   271,   272,   396,   185,   330,   386,   189,   191
 };
-short yygindex[] = {                                   1152,
-  347,    0, 1150,  930,    0,    0,  435, 1056,  449,  283,
- -135,    0,   57,  -11,  -25,  122,    0,    0,    0,    0,
-    0,  765,  810, -294,    0, -159,    0,  892,    0,  -10,
-  -44, -156, 1177, 1182,  830,  244, 1039,  301,  840,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 1114,    0,
-    0,    0,    0,    0, 1134,  231,  752,    0, 1207,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  768,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  780,    0,    0,    0, 1142,
-    0,    0,    0,    0,    0,    0, 1109, -186,    0,    0,
-    0,    0,    0,    0, 1067,    0,    0, 1063,    0,    0,
-    0,    0,  994,  -82,    0, 1078,    0,  999,  274, -170,
-    0,    0,    0,    0,    0,    0,    0,  849,    0,    0,
-    0,    0,  931, 1005,  974,    0,  856,    0,
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -356
+static const yytype_int16 yypact[] =
+{
+    -356,    61,  -356,    35,    83,  -356,  -356,  -356,  -356,  -356,
+    -356,  -356,  -356,    12,    37,    -9,  -356,  -356,  -356,    21,
+     469,   112,   100,    53,   118,    63,    36,    67,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,     9,  -356,  -356,   113,  -356,
+     153,   155,   207,    99,  -356,  -356,  -356,   120,   231,   215,
+     113,  -356,  -356,   218,  -356,  -356,   231,   209,  -356,  -356,
+     -22,   176,  -356,  -356,  -356,  -356,   244,  -356,  -356,    20,
+     493,   113,  -356,  -356,    -6,   247,  -356,   253,  -356,  -356,
+     489,  -356,  -356,   101,    99,   101,  -356,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,  -356,   283,   493,  -356,  -356,
+    -356,   284,  -356,  -356,   276,   285,  -356,  -356,  -356,  -356,
+    -356,   281,   288,   289,   290,   292,   293,  -356,  -356,    23,
+    -356,  -356,  -356,   243,   364,   364,   366,   369,   372,  -356,
+     315,   316,  -356,  -356,   314,  -356,  -356,   306,    16,   380,
+     156,   381,    87,  -356,   385,  -356,  -356,  -356,   277,   526,
+    -356,  -356,   382,  -356,  -356,  -356,   138,  -356,   243,  -356,
+     337,    73,  -356,   384,   409,   351,   352,   359,   369,   357,
+     372,   358,  -356,   243,   243,  -356,  -356,    46,   370,   419,
+    -356,  -356,   379,    97,   164,  -356,   374,   375,   388,    43,
+     -13,   -21,   416,   418,   438,   -31,   439,   440,   498,   451,
+    -356,   386,    36,   442,   434,  -356,   287,   437,    91,   156,
+     174,   174,   313,  -356,    29,  -356,  -356,    68,   -17,  -356,
+    -356,  -356,   494,   323,  -356,  -356,   214,  -356,   443,  -356,
+    -356,  -356,   500,  -356,  -356,  -356,  -356,  -356,   243,  -356,
+    -356,  -356,   243,  -356,  -356,  -356,  -356,  -356,  -356,   419,
+     445,   465,  -356,  -356,  -356,   470,  -356,   471,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,  -356,   432,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,   137,   137,  -356,   472,  -356,
+    -356,   137,  -356,  -356,  -356,  -356,  -356,   174,  -356,  -356,
+      19,   137,   156,  -356,  -356,  -356,   473,   474,  -356,   135,
+     410,   466,   516,   491,  -356,  -356,   474,  -356,    22,  -356,
+     192,   243,   243,   468,   243,   243,  -356,  -356,  -356,   490,
+    -356,  -356,   465,  -356,   419,   499,  -356,  -356,  -356,  -356,
+    -356,  -356,   474,    25,  -356,   156,  -356,  -356,  -356,  -356,
+    -356,   135,    10,   249,  -356,   451,   174,  -356,  -356,   441,
+    -356,   474,   486,     8,  -356,   280,  -356,   256,  -356,   474,
+     551,   552,   553,   554,   555,   556,  -356,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,   501,   506,  -356,  -356,  -356,   474,
+     156,  -356,  -356,   505,  -356,   172,  -356,  -356,   135,  -356,
+    -356,  -356,   497,  -356,  -356,  -356,   242,  -356,  -356,  -356,
+    -356,    22,   192,   192,   192,   192,   192,   192,   243,  -356,
+    -356,  -356,  -356,  -356,   503,  -356,  -356,   510,  -356,    36,
+     528,  -356,  -356,  -356,  -356,  -356,   474,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,   474,  -356,  -356,  -356,   507,
+     508,  -356,   512,   511,   384,  -356,  -356,   513,  -356,  -356,
+    -356,    36,   353,   117,  -356,  -356,  -356,  -356,   504,  -356,
+    -356,   569,  -356,  -356,  -356,   509,  -356,   521,   520,  -356,
+    -356,  -356
 };
-#define YYTABLESIZE 1510
-short yytable[] = {                                      68,
-   20,  226,  218,   77,   63,  225,   90,  228,  123,   90,
-  123,  123,  123,   90,  123,  149,   90,   84,  372,  122,
-   84,  122,  122,  122,   87,  122,   90,   87,  123,  123,
-  266,  123,  239,   90,   16,  235,  373,   89,  409,  122,
-  122,   37,  122,   37,   37,   37,   36,   37,   36,   36,
-   36,  198,   36,  299,   13,  115,  149,  177,  149,  223,
-  267,  123,  119,  135,   37,  405,  305,  218,  372,   36,
-   73,   18,  122,  194,   23,   47,  310,   23,  218,   23,
-   23,   23,  290,   23,  480,  218,  479,  353,  135,   23,
-   89,  138,  313,  123,   37,  177,  238,   23,   23,   36,
-   23,   25,  226,  195,   91,  437,  225,   91,   67,  257,
-   67,   67,   67,   23,   67,   23,  308,   23,  308,   68,
-  149,   68,   68,   68,   91,   68,   28,  159,   67,   67,
-   23,   67,   27,   23,   23,  222,  209,  355,  159,   68,
-   68,   55,   68,  386,  387,  291,  389,  390,  478,   15,
-   23,  218,  106,   23,   23,  411,  106,  310,  242,  236,
-  237,   67,   23,   50,   52,   50,   50,   50,  133,   50,
-  106,  106,   68,  313,  476,  257,  243,   80,   16,   66,
-  308,   17,  399,   50,   50,  117,   50,  368,   90,  197,
-  313,   21,   21,   67,   80,  297,  218,  323,   23,  403,
-  209,   21,  159,  218,   68,   71,   67,  237,   67,   71,
-   56,  218,   66,   59,  281,  226,   50,  237,  146,  225,
-   70,  231,  223,   67,  223,   23,   23,   76,   36,  431,
-  274,  123,   36,   90,  274,   75,   75,  280,  408,  371,
-  453,   67,  122,  218,  221,  112,   77,  327,  274,  274,
-  400,   78,  308,   77,  147,  148,   90,   78,  149,  123,
-   73,  123,  326,   90,   37,   73,  123,   84,  411,   36,
-  122,   66,  122,  295,   87,   37,   37,   37,   37,   37,
-   37,   37,   37,   37,   37,   37,   37,   37,  233,  408,
-   23,   91,   37,   37,   37,   37,  152,  116,  152,   36,
-   23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-   23,  236,  218,  226,  226,  323,  364,  225,  225,   79,
-   23,   66,  226,  413,   91,  116,  225,   95,   23,   23,
-   23,   67,   67,   67,   67,   67,   67,   67,   67,   67,
-   67,   67,   68,   68,   68,   68,   68,   68,   68,   68,
-   68,   68,   68,   72,   91,  122,  122,   72,  122,   67,
-  152,   67,    2,    3,  145,   23,  145,  363,  145,  111,
-   68,  116,   68,   23,   23,   23,   23,   23,   23,   23,
-   23,   23,   23,   23,  145,  145,   50,   50,   50,   50,
-   50,   50,   50,   50,   50,   50,   50,  283,   74,  117,
-  226,   23,   23,  117,  225,   57,   58,  455,  155,  122,
-  155,  121,   73,  194,   50,  282,   50,  117,  117,  129,
-  122,   97,  226,  286,  323,  442,  225,  139,   71,   71,
-   71,   71,   71,   71,   71,   71,   71,   71,   71,  284,
-  285,  140,  455,  195,  226,  141,  227,   36,  225,  145,
-  142,   36,  274,  273,  275,  276,   71,   23,   36,   36,
-   36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-   36,   36,  155,  310,  151,  417,   36,   76,   36,   36,
-   63,   63,   36,   36,   36,   36,   36,   36,   36,   36,
-   36,   36,   36,   36,   36,  338,  143,  417,  152,  216,
-   36,  420,   36,  212,  208,   80,  206,  144,  207,  209,
-  204,  210,  309,  211,  104,  113,  419,  325,  104,  145,
-  104,  152,  118,  317,  106,  183,  202,  201,  203,  114,
-   82,   83,   84,  152,   67,  104,  223,  154,  155,   30,
-   31,   32,   33,   34,   35,   36,   37,  300,  134,  310,
-  186,  137,  187,  295,  369,  107,  106,  205,  122,  107,
-  213,  241,  300,  191,  224,  367,  189,  104,  295,  392,
-  393,  351,  192,  107,  107,  200,   72,   72,   72,   72,
-   72,   72,   72,   72,   72,   72,   72,  239,  251,  354,
-  214,  239,  215,  122,  348,  349,   62,  220,   60,  370,
-   61,  378,  289,  289,   72,  239,  239,  367,  249,  412,
-  155,   21,   21,  356,   80,  250,   63,  418,  300,  301,
-  117,   21,   81,  398,  154,  155,   30,   31,   32,   33,
-   34,   35,   36,   37,  232,  246,  436,  248,  401,   82,
-   83,   84,  268,   67,  253,  155,  443,  255,  117,  269,
-  412,  282,  282,  367,   64,   64,  272,  240,  418,  241,
-  279,  240,  277,  241,  278,  287,  288,  347,   36,  289,
-  464,  465,  292,  293,  466,  240,  240,  241,  241,   36,
-   36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-   36,   36,  445,  298,  296,  286,  286,   36,  132,   36,
-  312,  314,  231,  223,  484,  454,  231,  328,  343,   38,
-   39,   40,   41,   42,   43,   44,   45,   46,  197,  268,
-  231,  231,  332,  357,  342,  350,  198,  268,  154,  155,
-   30,   31,   32,   33,   34,   35,   36,   37,  289,  289,
-  289,  289,  289,  289,  289,  289,  289,  289,  289,  289,
-  289,  289,  289,  289,  289,  289,  289,  289,  289,  289,
-  289,  289,  345,  289,  289,  289,  289,  289,  346,  289,
-  289,  289,  283,  283,  289,  289,  289,  289,  289,  289,
-  289,  289,  358,  359,  361,  360,  388,  282,  282,  282,
-  282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
-  282,  282,  282,  282,  282,  282,  282,  282,  282,  282,
-  282,  391,  282,  282,  282,  282,  282,  397,  282,  282,
-  282,  285,  285,  282,  282,  282,  282,  282,  282,  282,
-  282,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-  286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
-  286,  286,  286,  286,  286,  414,  286,  286,  286,  286,
-  286,  421,  286,  286,  286,  287,  287,  286,  286,  286,
-  286,  286,  286,  286,  286,   63,   63,  422,  428,  197,
-  197,  197,  423,   63,   63,  424,  429,  198,  198,  198,
-  197,  197,  197,  197,  197,  197,  197,  197,  198,  198,
-  198,  198,  198,  198,  198,  198,  425,  426,  283,  283,
-  283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-  283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
-  283,  283,  432,  283,  283,  283,  283,  283,  433,  283,
-  283,  283,  284,  284,  283,  283,  283,  283,  283,  283,
-  283,  283,  458,  461,  463,  467,  468,  285,  285,  285,
-  285,  285,  285,  285,  285,  285,  285,  285,  285,  285,
-  285,  285,  285,  285,  285,  285,  285,  285,  285,  285,
-  285,  472,  285,  285,  285,  285,  285,  469,  285,  285,
-  285,  292,  292,  285,  285,  285,  285,  285,  285,  285,
-  285,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-  287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
-  287,  287,  287,  287,  287,  473,  287,  287,  287,  287,
-  287,  485,  287,  287,  287,  202,  268,  287,  287,  287,
-  287,  287,  287,  287,  287,  154,  155,   30,   31,   32,
-   33,   34,   35,   36,   37,  488,  487,  235,  192,  268,
-  489,  235,  490,   13,  161,   10,  203,  268,  379,  380,
-  381,  382,  383,  384,  404,  235,  235,  162,  284,  284,
-  284,  284,  284,  284,  284,  284,  284,  284,  284,  284,
-  284,  284,  284,  284,  284,  284,  284,  284,  284,  284,
-  284,  284,  325,  284,  284,  284,  284,  284,  327,  284,
-  284,  284,  193,  268,  284,  284,  284,  284,  284,  284,
-  284,  284,  304,  308,   80,  318,  305,  292,  292,  292,
-  292,  292,  292,  292,  292,  292,  292,  292,  292,  292,
-  292,  292,  292,  292,  292,  292,  292,  292,  292,  292,
-  292,    1,  292,  292,  292,  292,  292,  269,  292,  292,
-  292,   19,  311,  292,  292,  292,  292,  292,  292,  292,
-  292,  136,   29,  407,  439,   30,   31,   32,   33,   34,
-   35,   36,   37,   38,   39,   40,   41,   42,   43,   44,
-   45,   46,   63,   63,  352,   49,  202,  202,  202,  229,
-   50,  415,  230,  229,  410,  120,   96,  202,  202,  202,
-  202,  202,  202,  202,  202,   63,   63,  229,  229,  192,
-  192,  192,  483,   63,   63,   51,  470,  203,  203,  203,
-  192,  192,  192,  192,  192,  192,  192,  192,  203,  203,
-  203,  203,  203,  203,  203,  203,  294,  475,  230,  130,
-  185,  254,  230,  252,  336,  240,  335,   38,   39,   40,
-   41,   42,   43,   44,   45,   46,  230,  230,  446,   63,
-   63,  394,  341,  193,  193,  193,  447,  448,  449,  450,
-  451,  452,    0,    0,  193,  193,  193,  193,  193,  193,
-  193,  193,   45,   45,   45,   45,   45,   45,   45,   45,
-   45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-   45,   45,   45,   45,   45,   45,  396,    0,    0,    0,
-    0,   45,    0,   45,  153,  154,  155,   30,   31,   32,
-   33,   34,  156,   36,   37,   38,   39,   40,   41,   42,
-   43,   44,   45,   46,  157,    0,    0,  158,    0,    0,
-    0,    0,  159,   67,    0,   18,  160,  161,   66,  154,
-  155,   30,   31,   32,   33,   34,   35,   36,   37,   38,
-   39,   40,   41,   42,   43,   44,   45,   46,  234,   66,
-    0,  158,    0,    0,    0,    0,    0,   67,    0,   18,
-   38,   39,   40,   41,   42,   43,   44,   45,   46,  234,
-   36,    0,  158,  232,    0,  233,    0,  232,   67,  233,
-   18,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-    0,  232,  232,  233,  233,  234,    0,  236,    0,  234,
-  237,  236,  238,    0,  237,  106,  238,  255,    0,  106,
-    0,  255,    0,  234,  234,  236,  236,    0,  237,  237,
-  238,  238,    0,  106,  106,  255,  255,  256,    0,  265,
-    0,  256,  116,  265,    0,    0,  116,    0,    0,    0,
-    0,   82,   83,   84,    0,  256,  256,  265,  265,    0,
-  116,  116,   98,   99,  100,  101,  102,  103,  104,  105,
-  154,  155,   30,   31,   32,   33,   34,   35,   36,   37,
-    0,   38,   39,   40,   41,   42,   43,   44,   45,   46,
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -356,   581,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,
+     492,  -356,  -356,  -356,  -356,  -356,    54,  -356,   514,  -260,
+     114,  -356,  -133,  -356,  -223,  -158,   563,   564,   566,  -157,
+    -356,   -16,   574,  -356,   -12,   -26,   -11,  -356,  -356,  -356,
+    -356,  -356,  -356,  -355,  -356,  -356,   181,   229,  -356,  -356,
+     219,  -356,   232,  -356,  -159,  -356,  -356,  -356,  -356,  -356,
+    -180,   423,  -216,  -218,  -356,   286,  -356,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,   124,
+    -356,  -356,   360,  -356,  -356,  -356,   479,  -356,  -356,  -356,
+    -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,  -356,
+    -356,  -310,  -356,   335,  -356,  -356,   421,  -356,  -356,   342,
+    -240,  -356,  -356,   132,   502,   -41,  -221,  -356,  -356,  -131,
+    -356,  -356,  -356,   180,  -356,  -356,  -356,  -356,  -356,   260,
+    -356,   139,   336,   263,  -356,   459,  -356,    47,   420,   422
 };
-short yycheck[] = {                                      25,
-   12,   38,  159,   41,   58,   42,   41,  164,   38,   44,
-   40,   41,   42,   41,   44,   58,   44,   41,   40,   38,
-   44,   40,   41,   42,   41,   44,   61,   44,   58,   59,
-   61,   61,   59,   61,  125,  171,   58,   63,   61,   58,
-   59,   38,   61,   40,   41,   42,   38,   44,   40,   41,
-   42,  123,   44,  224,  261,   81,   59,  140,   61,  261,
-   91,   91,   88,   59,   61,  360,  226,  224,   40,   61,
-   60,  292,   91,   61,   44,   19,   44,   38,  235,   40,
-   41,   42,   61,   44,   59,  242,   61,  289,  114,   59,
-  116,  117,   44,  123,   91,  178,  123,   58,   59,   91,
-   61,   61,   38,   91,   41,   41,   42,   44,   38,  192,
-   40,   41,   42,   38,   44,   40,   59,   42,   61,   38,
-  123,   40,   41,   42,   61,   44,   60,  123,   58,   59,
-   91,   61,  123,   58,   59,  161,   59,  308,   59,   58,
-   59,   20,   61,  330,  331,  124,  333,  334,  123,  261,
-   38,  308,   40,  123,   42,   91,   44,  125,   40,  171,
-  171,   91,  123,   38,  261,   40,   41,   42,  112,   44,
-   58,   59,   91,  125,  469,  258,   58,  261,  290,  261,
-  123,  293,  353,   58,   59,  269,   61,  323,   67,  261,
-  235,  282,  283,  123,  261,  221,  353,  242,  123,  359,
-  123,  292,  123,  360,  123,   38,  290,  218,  290,   42,
-   59,  368,  261,  123,   38,   38,   91,  228,  261,   42,
-  123,  165,  261,  290,  261,   58,   59,   41,   38,  400,
-   40,  261,   42,  261,   44,  290,  290,   61,  261,  261,
-  427,  290,  261,  400,  293,   40,  261,   44,   58,   59,
-  289,   41,  289,  291,  297,  298,  291,  261,  261,  289,
-   60,  291,   59,  291,  261,   60,  296,  291,   91,  261,
-  289,  261,  291,  217,  291,  272,  273,  274,  275,  276,
-  277,  278,  279,  280,  281,  282,  283,  284,  167,  261,
-  123,   59,  289,  290,  291,  292,   59,  261,   61,  291,
-  261,  262,  263,  264,  265,  266,  267,  268,  269,  270,
-  271,  323,  469,   38,   38,  360,   40,   42,   42,  261,
-  290,  261,   38,  368,  261,  289,   42,   62,  289,  290,
-  291,  261,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,  261,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,   38,  291,   58,   59,   42,   61,  289,
-  123,  291,  293,  294,   38,  290,   40,   91,   42,   41,
-  289,   44,  291,  261,  262,  263,  264,  265,  266,  267,
-  268,  269,  270,  271,   58,   59,  261,  262,  263,  264,
-  265,  266,  267,  268,  269,  270,  271,   43,   52,   40,
-   38,  289,  290,   44,   42,  282,  283,  433,   59,   62,
-   61,  125,   60,   61,  289,   61,  291,   58,   59,  125,
-  123,   75,   38,   45,  469,   41,   42,  125,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,   61,
-   62,   58,  468,   91,   38,   40,  164,  261,   42,  123,
-   40,  261,   60,   61,   61,   62,  289,  290,  272,  273,
-  274,  275,  276,  277,  278,  279,  280,  281,  282,  283,
-  284,  261,  123,  230,   41,   91,  290,  291,  292,  289,
-  282,  283,  272,  273,  274,  275,  276,  277,  278,  279,
-  280,  281,  282,  283,  284,  265,   40,   91,  261,   33,
-  290,   44,  292,   37,   38,  261,   40,   40,   42,   43,
-   44,   45,  230,   47,   38,   81,   59,  244,   42,   40,
-   44,   41,   88,  241,   76,  261,   60,   61,   62,   81,
-  286,  287,  288,  296,  290,   59,  261,  262,  263,  264,
-  265,  266,  267,  268,  269,  270,  271,   44,  114,  306,
-  260,  117,  261,   44,  324,   40,  108,   91,  261,   44,
-   94,  126,   59,   58,  289,  322,  261,   91,   59,  339,
-  340,  298,   58,   58,   59,  261,  261,  262,  263,  264,
-  265,  266,  267,  268,  269,  270,  271,   40,   44,  307,
-  124,   44,  126,  296,  294,  295,   38,  261,   40,  326,
-   42,  328,  125,  126,  289,   58,   59,  364,   41,  366,
-  261,  282,  283,  313,  261,   41,   58,  374,  270,  271,
-  261,  292,  269,  350,  262,  263,  264,  265,  266,  267,
-  268,  269,  270,  271,  261,  261,  406,  261,  356,  286,
-  287,  288,  123,  290,   41,  296,  416,   41,  289,  261,
-  407,  125,  126,  410,  282,  283,   61,   40,  415,   40,
-   61,   44,   93,   44,   41,   61,   61,   42,  261,   61,
-  440,  441,   61,   61,  444,   58,   59,   58,   59,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-  283,  284,  419,   59,  123,  125,  126,  290,  261,  292,
-  261,  261,   40,  261,  474,  432,   44,   59,   44,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  125,  126,
-   58,   59,  260,  125,   61,   59,  125,  126,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-  283,  284,   61,  286,  287,  288,  289,  290,   61,  292,
-  293,  294,  125,  126,  297,  298,  299,  300,  301,  302,
-  303,  304,   59,   41,  291,   44,   41,  261,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  274,  275,  276,  277,  278,  279,  280,  281,  282,  283,
-  284,   93,  286,  287,  288,  289,  290,  125,  292,  293,
-  294,  125,  126,  297,  298,  299,  300,  301,  302,  303,
-  304,  261,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,  272,  273,  274,  275,  276,  277,  278,  279,
-  280,  281,  282,  283,  284,   58,  286,  287,  288,  289,
-  290,  261,  292,  293,  294,  125,  126,  297,  298,  299,
-  300,  301,  302,  303,  304,  282,  283,  261,   93,  286,
-  287,  288,  261,  282,  283,  261,  125,  286,  287,  288,
-  297,  298,  299,  300,  301,  302,  303,  304,  297,  298,
-  299,  300,  301,  302,  303,  304,  261,  261,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-  283,  284,   59,  286,  287,  288,  289,  290,   58,  292,
-  293,  294,  125,  126,  297,  298,  299,  300,  301,  302,
-  303,  304,  296,   93,   61,   40,   44,  261,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  274,  275,  276,  277,  278,  279,  280,  281,  282,  283,
-  284,   93,  286,  287,  288,  289,  290,   40,  292,  293,
-  294,  125,  126,  297,  298,  299,  300,  301,  302,  303,
-  304,  261,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,  272,  273,  274,  275,  276,  277,  278,  279,
-  280,  281,  282,  283,  284,   93,  286,  287,  288,  289,
-  290,   41,  292,  293,  294,  125,  126,  297,  298,  299,
-  300,  301,  302,  303,  304,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,  271,   41,  258,   40,  125,  126,
-  125,   44,   59,  123,  125,  123,  125,  126,  305,  306,
-  307,  308,  309,  310,  291,   58,   59,  125,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-  283,  284,   41,  286,  287,  288,  289,  290,   41,  292,
-  293,  294,  125,  126,  297,  298,  299,  300,  301,  302,
-  303,  304,  125,   59,   41,   41,  125,  261,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  274,  275,  276,  277,  278,  279,  280,  281,  282,  283,
-  284,    0,  286,  287,  288,  289,  290,  126,  292,  293,
-  294,   12,  233,  297,  298,  299,  300,  301,  302,  303,
-  304,  116,  261,  364,  410,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,  282,  283,  303,   19,  286,  287,  288,   40,
-   19,  372,  164,   44,  365,   92,   73,  297,  298,  299,
-  300,  301,  302,  303,  304,  282,  283,   58,   59,  286,
-  287,  288,  471,  282,  283,   19,  459,  286,  287,  288,
-  297,  298,  299,  300,  301,  302,  303,  304,  297,  298,
-  299,  300,  301,  302,  303,  304,  261,  468,   40,  108,
-  142,  189,   44,  187,  261,  178,  258,  272,  273,  274,
-  275,  276,  277,  278,  279,  280,   58,   59,  420,  282,
-  283,  341,  268,  286,  287,  288,  421,  422,  423,  424,
-  425,  426,   -1,   -1,  297,  298,  299,  300,  301,  302,
-  303,  304,  261,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,  281,  282,  283,  284,  343,   -1,   -1,   -1,
-   -1,  290,   -1,  292,  261,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,  271,  272,  273,  274,  275,  276,
-  277,  278,  279,  280,  281,   -1,   -1,  284,   -1,   -1,
-   -1,   -1,  289,  290,   -1,  292,  293,  294,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  261,
-   -1,  284,   -1,   -1,   -1,   -1,   -1,  290,   -1,  292,
-  272,  273,  274,  275,  276,  277,  278,  279,  280,  281,
-  261,   -1,  284,   40,   -1,   40,   -1,   44,  290,   44,
-  292,  272,  273,  274,  275,  276,  277,  278,  279,  280,
-   -1,   58,   59,   58,   59,   40,   -1,   40,   -1,   44,
-   40,   44,   40,   -1,   44,   40,   44,   40,   -1,   44,
-   -1,   44,   -1,   58,   59,   58,   59,   -1,   58,   59,
-   58,   59,   -1,   58,   59,   58,   59,   40,   -1,   40,
-   -1,   44,   40,   44,   -1,   -1,   44,   -1,   -1,   -1,
-   -1,  286,  287,  288,   -1,   58,   59,   58,   59,   -1,
-   58,   59,  297,  298,  299,  300,  301,  302,  303,  304,
-  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
-   -1,  272,  273,  274,  275,  276,  277,  278,  279,  280,
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -276
+static const yytype_int16 yytable[] =
+{
+      69,    22,   219,   301,    51,   326,   339,   226,   303,   233,
+     232,    58,   182,   309,   414,   406,    67,   406,   314,    76,
+     320,   387,   388,   198,   390,   391,   228,    80,   291,   372,
+     149,   225,   228,     3,     4,   105,   228,    85,   285,    74,
+     103,   286,    14,    67,   100,   292,   283,   182,    28,   120,
+      19,   287,   -17,    63,   355,   101,    68,    91,   284,   352,
+     400,     2,   260,   106,   312,   370,   150,   151,   219,   407,
+      74,   219,    68,   199,   373,   313,   120,   126,    85,   129,
+     393,   394,    29,   318,   125,   219,   225,   371,   373,   379,
+      16,   357,   374,   152,    67,   314,    26,   230,   231,   225,
+       3,     4,   281,   364,   -24,   267,    80,    55,    80,    75,
+     268,   399,   282,    59,    81,   349,   350,   479,   454,    17,
+      66,   353,    18,    68,    71,   -24,   222,   260,   -24,    74,
+      98,    82,    83,    84,   402,    68,   223,    68,   -24,   243,
+      53,    54,   411,   244,   434,   364,   320,   410,   412,    76,
+     195,   356,   227,   236,   219,   196,   274,   444,   275,   419,
+      77,   238,    78,   365,   155,   156,    31,    32,    33,    34,
+      35,    36,    37,    38,   480,  -160,   481,   482,   459,   432,
+     446,    74,   466,    80,    60,   467,    61,    62,    63,   410,
+     304,   305,   364,   455,   401,   239,   298,   219,   240,   360,
+     419,   361,   296,   230,   231,   230,   231,   219,    82,    83,
+      84,   219,    68,   102,    79,   202,   485,   203,   204,   205,
+     206,   107,   207,   276,   208,   209,   277,   210,   211,   212,
+     213,   214,   215,   216,   217,   127,   409,   130,    67,   435,
+     230,   231,   219,   380,   381,   382,   383,   384,   385,   320,
+     154,   155,   156,    31,    32,    33,    34,    35,   157,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+     158,   -64,   -64,   159,   327,    92,    99,   328,   160,    68,
+      96,    19,   161,   162,   228,   155,   156,    31,    32,    33,
+      34,    35,    36,    37,    38,   155,   156,    31,    32,    33,
+      34,    35,    36,    37,    38,   122,   418,   104,   227,   443,
+     230,   231,   229,   409,   219,   123,   420,   230,   231,   421,
+    -269,   155,   156,    31,    32,    33,    34,    35,    36,    37,
+      38,   155,   156,    31,    32,    33,    34,    35,    36,    37,
+      38,   137,   140,   141,   418,   230,   231,  -275,   230,   231,
+    -275,   143,   142,  -275,   144,   145,   146,  -275,   147,   148,
+     -77,   155,   156,    31,    32,    33,    34,    35,    36,    37,
+      38,   184,   187,   195,  -107,    74,   188,  -107,   196,   190,
+    -107,   230,   231,  -270,  -107,   192,   193,   201,   221,   237,
+     -77,   247,    67,   155,   156,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,   224,   460,   242,   159,   249,    67,   250,   251,
+     -79,    68,   252,    19,   254,   256,   270,   269,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,   224,   273,   278,
+     159,   300,   279,   297,   302,   460,    68,   280,    19,   155,
+     156,    31,    32,    33,    34,    35,    36,    37,    38,   155,
+     156,    31,    32,    33,    34,    35,    36,    37,    38,   448,
+     449,   450,   451,   452,   453,   288,    30,   289,   413,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,   124,   290,   293,   294,
+     348,   228,   299,   329,   343,   295,   333,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    82,    83,    84,   344,   346,
+     347,   358,   351,   366,   359,   389,   108,   109,   110,   111,
+     112,   113,   114,   115,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,   367,   369,   392,   415,   398,   422,   423,
+     424,   425,   426,   427,   430,   433,   429,   439,   456,   458,
+     463,   486,   469,   488,   470,   471,   489,   472,   474,   490,
+     491,     1,   475,    48,    49,   121,    50,    20,    97,   437,
+     405,   234,   416,   354,   408,   477,   138,   337,   315,   241,
+     336,   447,   395,   473,   186,   342,   128,   397,   253,     0,
+       0,     0,   255
 };
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 310
-#if YYDEBUG
-char *yyname[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-"'!'",0,0,0,"'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,"'/'",0,0,0,0,0,
-0,0,0,0,0,"':'","';'","'<'","'='","'>'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,"'['",0,"']'","'^'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,"'{'","'|'","'}'","'~'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"CHAR_VAL","INT_VAL",
-"DOUBLE_VAL","STRING","IDENTIFIER","FRIEND","TYPEDEF","AUTO","REGISTER",
-"STATIC","EXTERN","INLINE","VIRTUAL","CONST","VOLATILE","CHAR","SHORT","INT",
-"LONG","SIGNED","UNSIGNED","FLOAT","DOUBLE","VOID","ENUM","CLASS","STRUCT",
-"UNION","ASM","PRIVATE","PROTECTED","PUBLIC","OPERATOR","DBL_COLON",
-"TRIPLE_DOT","TEMPLATE","NAMESPACE","USING","MUTABLE","THROW","SIGNALS","SLOTS",
-"Q_OBJECT","Q_PROPERTY","Q_OVERRIDE","Q_CLASSINFO","Q_ENUMS","Q_SETS","READ",
-"WRITE","STORED","DESIGNABLE","SCRIPTABLE","RESET",
+
+static const yytype_int16 yycheck[] =
+{
+      26,    13,   160,   226,    20,   245,   266,   164,   229,   168,
+     168,    22,   143,   231,   369,     7,     7,     7,   234,    36,
+     243,   331,   332,     7,   334,   335,     7,     7,    59,     7,
+       7,   164,     7,    39,    40,    15,     7,    63,    59,    61,
+      81,    62,     7,     7,    66,    76,    59,   178,    57,    90,
+      38,    72,    58,    70,    35,    81,    36,    68,    71,   299,
+      35,     0,   193,    89,    35,   325,    43,    44,   226,    59,
+      61,   229,    36,    57,    66,   234,   117,   103,   104,   105,
+     340,   341,    61,   242,   100,   243,   219,   327,    66,   329,
+       7,   312,    70,    70,     7,   311,    59,    68,    69,   232,
+      39,    40,    59,   319,    36,    59,     7,     7,     7,    55,
+      64,   351,    69,    60,    15,   295,   296,   472,   428,    36,
+      57,   301,    39,    36,    57,    57,    39,   258,    60,    61,
+      76,    32,    33,    34,   355,    36,   162,    36,    70,    66,
+      28,    29,   365,    70,   404,   361,   369,   363,   366,    36,
+      59,   310,   164,   169,   312,    64,    59,   417,    61,   375,
+       7,   172,     7,   320,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    57,    57,    59,    60,   438,   400,
+     420,    61,   442,     7,    66,   445,    68,    69,    70,   405,
+      16,    17,   408,   433,   353,    57,   222,   355,    60,    64,
+     416,    66,   218,    68,    69,    68,    69,   365,    32,    33,
+      34,   369,    36,    81,     7,    59,   476,    61,    62,    63,
+      64,    89,    66,    59,    68,    69,    62,    71,    72,    73,
+      74,    75,    76,    77,    78,   103,    64,   105,     7,    67,
+      68,    69,   400,    51,    52,    53,    54,    55,    56,   472,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    60,    60,    67,    63,    35,    36,
+      62,    38,    39,    40,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    58,    64,    63,   320,    67,
+      68,    69,    35,    64,   472,    62,    60,    68,    69,    63,
+      77,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    58,    58,    67,    64,    68,    69,    60,    68,    69,
+      63,    70,    67,    66,    66,    66,    66,    70,    66,    66,
+      37,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,     7,     6,    59,    60,    61,     7,    63,    64,     7,
+      66,    68,    69,    77,    70,    70,    70,     7,     7,     7,
+      67,     7,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,   439,    77,    30,     7,     7,    67,    67,
+      67,    36,    63,    38,    67,    67,     7,    57,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    59,    65,
+      30,     7,    67,    57,     7,   471,    36,    59,    38,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,   422,
+     423,   424,   425,   426,   427,    59,     7,    59,    37,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,     7,    59,    59,    59,
+      68,     7,    60,    60,    59,     7,     6,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    32,    33,    34,    63,    59,
+      59,    58,    60,    67,    60,    67,    43,    44,    45,    46,
+      47,    48,    49,    50,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    37,    63,    65,    70,    58,     7,     7,
+       7,     7,     7,     7,    58,    60,    65,    70,    65,    59,
+      42,    67,    65,     4,    66,    63,    67,    66,    65,    58,
+      60,     0,   468,    20,    20,    93,    20,    13,    74,   408,
+     361,   168,   373,   307,   362,   471,   117,   262,   238,   178,
+     258,   421,   342,   464,   145,   269,   104,   344,   188,    -1,
+      -1,    -1,   190
 };
-char *yyrule[] = {
-"$accept : declaration_seq",
-"declaration_seq :",
-"declaration_seq : declaration_seq declaration",
-"declaration : class_def",
-"declaration : namespace_def",
-"declaration : namespace_alias_def",
-"declaration : using_declaration",
-"declaration : using_directive",
-"namespace_def : named_namespace_def",
-"namespace_def : unnamed_namespace_def",
-"$$1 :",
-"$$2 :",
-"named_namespace_def : NAMESPACE IDENTIFIER $$1 '{' $$2 namespace_body '}'",
-"$$3 :",
-"$$4 :",
-"unnamed_namespace_def : NAMESPACE $$3 '{' $$4 namespace_body '}'",
-"namespace_body : declaration_seq",
-"namespace_alias_def : NAMESPACE IDENTIFIER '=' complete_class_name ';'",
-"using_directive : USING NAMESPACE",
-"using_declaration : USING IDENTIFIER",
-"using_declaration : USING DBL_COLON",
-"$$5 :",
-"class_def : $$5 class_specifier ';'",
-"class_name : IDENTIFIER",
-"class_name : template_class_name",
-"template_class_name : IDENTIFIER '<' template_args '>'",
-"template_args :",
-"const_expression :",
-"def_argument :",
-"enumerator_expression :",
-"decl_specifier : storage_class_specifier",
-"decl_specifier : type_specifier",
-"decl_specifier : fct_specifier",
-"decl_specifier : FRIEND",
-"decl_specifier : TYPEDEF",
-"decl_specifiers : decl_specs_opt type_name decl_specs_opt",
-"decl_specs_opt :",
-"decl_specs_opt : decl_specs",
-"decl_specs : decl_specifier",
-"decl_specs : decl_specs decl_specifier",
-"storage_class_specifier : AUTO",
-"storage_class_specifier : REGISTER",
-"storage_class_specifier : STATIC",
-"storage_class_specifier : EXTERN",
-"fct_specifier : INLINE",
-"fct_specifier : VIRTUAL",
-"type_specifier : CONST",
-"type_specifier : VOLATILE",
-"type_name : elaborated_type_specifier",
-"type_name : complete_class_name",
-"type_name : simple_type_names",
-"simple_type_names : simple_type_names simple_type_name",
-"simple_type_names : simple_type_name",
-"simple_type_name : CHAR",
-"simple_type_name : SHORT",
-"simple_type_name : INT",
-"simple_type_name : LONG",
-"simple_type_name : SIGNED",
-"simple_type_name : UNSIGNED",
-"simple_type_name : FLOAT",
-"simple_type_name : DOUBLE",
-"simple_type_name : VOID",
-"template_spec : TEMPLATE '<' template_args '>'",
-"opt_template_spec :",
-"opt_template_spec : template_spec",
-"class_key : opt_template_spec CLASS",
-"class_key : opt_template_spec STRUCT",
-"complete_class_name : qualified_class_name",
-"complete_class_name : DBL_COLON qualified_class_name",
-"qualified_class_name : qualified_class_name DBL_COLON class_name",
-"qualified_class_name : class_name",
-"elaborated_type_specifier : class_key IDENTIFIER",
-"elaborated_type_specifier : ENUM IDENTIFIER",
-"elaborated_type_specifier : UNION IDENTIFIER",
-"argument_declaration_list : arg_declaration_list_opt triple_dot_opt",
-"argument_declaration_list : arg_declaration_list ',' TRIPLE_DOT",
-"arg_declaration_list_opt :",
-"arg_declaration_list_opt : arg_declaration_list",
-"opt_exception_argument :",
-"opt_exception_argument : argument_declaration",
-"triple_dot_opt :",
-"triple_dot_opt : TRIPLE_DOT",
-"arg_declaration_list : arg_declaration_list ',' argument_declaration",
-"arg_declaration_list : argument_declaration",
-"argument_declaration : decl_specifiers abstract_decl_opt",
-"$$6 :",
-"argument_declaration : decl_specifiers abstract_decl_opt '=' $$6 def_argument",
-"argument_declaration : decl_specifiers abstract_decl_opt dname abstract_decl_opt",
-"$$7 :",
-"argument_declaration : decl_specifiers abstract_decl_opt dname abstract_decl_opt '=' $$7 def_argument",
-"abstract_decl_opt :",
-"abstract_decl_opt : abstract_decl",
-"abstract_decl : abstract_decl ptr_operator",
-"$$8 :",
-"abstract_decl : '[' $$8 const_expression ']'",
-"$$9 :",
-"abstract_decl : abstract_decl '[' $$9 const_expression ']'",
-"abstract_decl : ptr_operator",
-"abstract_decl : '(' abstract_decl ')'",
-"declarator : dname",
-"declarator : declarator ptr_operator",
-"$$10 :",
-"declarator : declarator '[' $$10 const_expression ']'",
-"declarator : '(' declarator ')'",
-"dname : IDENTIFIER",
-"fct_decl : '(' argument_declaration_list ')' cv_qualifier_list_opt ctor_initializer_opt exception_spec_opt opt_identifier fct_body_or_semicolon",
-"fct_name : IDENTIFIER",
-"fct_name : IDENTIFIER array_decls",
-"$$11 :",
-"fct_name : IDENTIFIER '=' $$11 const_expression",
-"$$12 :",
-"fct_name : IDENTIFIER array_decls '=' $$12 const_expression",
-"$$13 :",
-"array_decls : '[' $$13 const_expression ']'",
-"$$14 :",
-"array_decls : array_decls '[' $$14 const_expression ']'",
-"ptr_operators_opt :",
-"ptr_operators_opt : ptr_operators",
-"ptr_operators : ptr_operator",
-"ptr_operators : ptr_operators ptr_operator",
-"ptr_operator : '*' cv_qualifier_list_opt",
-"ptr_operator : '&' cv_qualifier_list_opt",
-"cv_qualifier_list_opt :",
-"cv_qualifier_list_opt : cv_qualifier_list",
-"cv_qualifier_list : cv_qualifier",
-"cv_qualifier_list : cv_qualifier_list cv_qualifier",
-"cv_qualifier : CONST",
-"cv_qualifier : VOLATILE",
-"fct_body_or_semicolon : ';'",
-"fct_body_or_semicolon : fct_body",
-"fct_body_or_semicolon : '=' INT_VAL ';'",
-"$$15 :",
-"fct_body : '{' $$15 '}'",
-"$$16 :",
-"class_specifier : full_class_head '{' $$16 opt_obj_member_list '}'",
-"class_specifier : class_head",
-"class_specifier : class_head '*' IDENTIFIER",
-"class_specifier : class_head '&' IDENTIFIER",
-"class_specifier : class_head '(' IDENTIFIER ')'",
-"class_specifier : template_spec whatever",
-"whatever : IDENTIFIER",
-"whatever : simple_type_name",
-"whatever : type_specifier",
-"whatever : storage_class_specifier",
-"whatever : fct_specifier",
-"class_head : class_key qualified_class_name",
-"class_head : class_key IDENTIFIER class_name",
-"full_class_head : class_head opt_base_spec",
-"nested_class_head : class_key qualified_class_name opt_base_spec",
-"exception_spec_opt :",
-"exception_spec_opt : exception_spec",
-"exception_spec : THROW '(' opt_exception_argument ')'",
-"ctor_initializer_opt :",
-"ctor_initializer_opt : ctor_initializer",
-"ctor_initializer : ':' mem_initializer_list",
-"mem_initializer_list : mem_initializer",
-"mem_initializer_list : mem_initializer ',' mem_initializer_list",
-"$$17 :",
-"mem_initializer : complete_class_name '(' $$17 const_expression ')'",
-"opt_base_spec :",
-"opt_base_spec : base_spec",
-"opt_obj_member_list :",
-"opt_obj_member_list : obj_member_list",
-"obj_member_list : obj_member_list obj_member_area",
-"obj_member_list : obj_member_area",
-"qt_access_specifier : access_specifier",
-"qt_access_specifier : SLOTS",
-"$$18 :",
-"obj_member_area : qt_access_specifier $$18 slot_area",
-"$$19 :",
-"obj_member_area : SIGNALS $$19 ':' opt_signal_declarations",
-"obj_member_area : Q_OBJECT",
-"$$20 :",
-"$$21 :",
-"obj_member_area : Q_PROPERTY $$20 '(' property ')' $$21 opt_property_candidates",
-"$$22 :",
-"$$23 :",
-"obj_member_area : Q_OVERRIDE $$22 '(' property ')' $$23 opt_property_candidates",
-"$$24 :",
-"$$25 :",
-"obj_member_area : Q_CLASSINFO $$24 '(' STRING ',' STRING ')' $$25 opt_property_candidates",
-"$$26 :",
-"$$27 :",
-"obj_member_area : Q_ENUMS $$26 '(' qt_enums ')' $$27 opt_property_candidates",
-"$$28 :",
-"$$29 :",
-"obj_member_area : Q_SETS $$28 '(' qt_sets ')' $$29 opt_property_candidates",
-"slot_area : SIGNALS ':'",
-"slot_area : SLOTS ':' opt_slot_declarations",
-"$$30 :",
-"slot_area : ':' $$30 opt_property_candidates",
-"slot_area : IDENTIFIER",
-"opt_property_candidates :",
-"opt_property_candidates : property_candidate_declarations",
-"property_candidate_declarations : property_candidate_declarations property_candidate_declaration",
-"property_candidate_declarations : property_candidate_declaration",
-"property_candidate_declaration : signal_or_slot",
-"opt_signal_declarations :",
-"opt_signal_declarations : signal_declarations",
-"signal_declarations : signal_declarations signal_declaration",
-"signal_declarations : signal_declaration",
-"signal_declaration : signal_or_slot",
-"opt_slot_declarations :",
-"opt_slot_declarations : slot_declarations",
-"slot_declarations : slot_declarations slot_declaration",
-"slot_declarations : slot_declaration",
-"slot_declaration : signal_or_slot",
-"opt_semicolons :",
-"opt_semicolons : opt_semicolons ';'",
-"base_spec : ':' base_list",
-"base_list : base_list ',' base_specifier",
-"base_list : base_specifier",
-"qt_macro_name : IDENTIFIER '(' IDENTIFIER ')'",
-"qt_macro_name : IDENTIFIER '(' simple_type_name ')'",
-"base_specifier : complete_class_name",
-"base_specifier : VIRTUAL access_specifier complete_class_name",
-"base_specifier : VIRTUAL complete_class_name",
-"base_specifier : access_specifier VIRTUAL complete_class_name",
-"base_specifier : access_specifier complete_class_name",
-"base_specifier : qt_macro_name",
-"base_specifier : VIRTUAL access_specifier qt_macro_name",
-"base_specifier : VIRTUAL qt_macro_name",
-"base_specifier : access_specifier VIRTUAL qt_macro_name",
-"base_specifier : access_specifier qt_macro_name",
-"access_specifier : PRIVATE",
-"access_specifier : PROTECTED",
-"access_specifier : PUBLIC",
-"operator_name : decl_specs_opt IDENTIFIER ptr_operators_opt",
-"operator_name : decl_specs_opt simple_type_name ptr_operators_opt",
-"operator_name : '+'",
-"operator_name : '-'",
-"operator_name : '*'",
-"operator_name : '/'",
-"operator_name : '%'",
-"operator_name : '^'",
-"operator_name : '&'",
-"operator_name : '|'",
-"operator_name : '~'",
-"operator_name : '!'",
-"operator_name : '='",
-"operator_name : '<'",
-"operator_name : '>'",
-"operator_name : '+' '='",
-"operator_name : '-' '='",
-"operator_name : '*' '='",
-"operator_name : '/' '='",
-"operator_name : '%' '='",
-"operator_name : '^' '='",
-"operator_name : '&' '='",
-"operator_name : '|' '='",
-"operator_name : '~' '='",
-"operator_name : '!' '='",
-"operator_name : '=' '='",
-"operator_name : '<' '='",
-"operator_name : '>' '='",
-"operator_name : '<' '<'",
-"operator_name : '>' '>'",
-"operator_name : '<' '<' '='",
-"operator_name : '>' '>' '='",
-"operator_name : '&' '&'",
-"operator_name : '|' '|'",
-"operator_name : '+' '+'",
-"operator_name : '-' '-'",
-"operator_name : ','",
-"operator_name : '-' '>' '*'",
-"operator_name : '-' '>'",
-"operator_name : '(' ')'",
-"operator_name : '[' ']'",
-"opt_virtual :",
-"opt_virtual : VIRTUAL",
-"type_and_name : type_name fct_name",
-"type_and_name : fct_name",
-"type_and_name : opt_virtual '~' fct_name",
-"type_and_name : decl_specs type_name decl_specs_opt ptr_operators_opt fct_name",
-"type_and_name : decl_specs type_name",
-"type_and_name : type_name ptr_operators fct_name",
-"type_and_name : type_name decl_specs ptr_operators_opt fct_name",
-"type_and_name : type_name OPERATOR operator_name",
-"type_and_name : OPERATOR operator_name",
-"type_and_name : decl_specs type_name decl_specs_opt ptr_operators_opt OPERATOR operator_name",
-"type_and_name : type_name ptr_operators OPERATOR operator_name",
-"type_and_name : type_name decl_specs ptr_operators_opt OPERATOR operator_name",
-"signal_or_slot : type_and_name fct_decl opt_semicolons",
-"signal_or_slot : type_and_name opt_bitfield ';' opt_semicolons",
-"signal_or_slot : type_and_name opt_bitfield ',' member_declarator_list ';' opt_semicolons",
-"signal_or_slot : enum_specifier opt_identifier ';' opt_semicolons",
-"signal_or_slot : USING complete_class_name ';' opt_semicolons",
-"signal_or_slot : USING NAMESPACE complete_class_name ';' opt_semicolons",
-"signal_or_slot : NAMESPACE IDENTIFIER '{'",
-"signal_or_slot : nested_class_head ';' opt_semicolons",
-"$$31 :",
-"$$32 :",
-"signal_or_slot : nested_class_head '{' $$31 '}' $$32 ';' opt_semicolons",
-"member_declarator_list : member_declarator",
-"member_declarator_list : member_declarator_list ',' member_declarator",
-"member_declarator : declarator",
-"$$33 :",
-"member_declarator : IDENTIFIER ':' $$33 const_expression",
-"$$34 :",
-"member_declarator : ':' $$34 const_expression",
-"opt_bitfield :",
-"$$35 :",
-"opt_bitfield : ':' $$35 const_expression",
-"enum_specifier : ENUM enum_tail",
-"opt_komma :",
-"opt_komma : ','",
-"enum_tail : IDENTIFIER '{' enum_list opt_komma '}'",
-"enum_tail : '{' enum_list opt_komma '}'",
-"opt_identifier :",
-"opt_identifier : IDENTIFIER",
-"enum_list :",
-"enum_list : enumerator",
-"enum_list : enum_list ',' enumerator",
-"enumerator : IDENTIFIER",
-"$$36 :",
-"enumerator : IDENTIFIER '=' $$36 enumerator_expression",
-"$$37 :",
-"property : IDENTIFIER IDENTIFIER $$37 prop_statements",
-"prop_statements :",
-"prop_statements : READ IDENTIFIER prop_statements",
-"prop_statements : WRITE IDENTIFIER prop_statements",
-"prop_statements : RESET IDENTIFIER prop_statements",
-"prop_statements : STORED IDENTIFIER prop_statements",
-"prop_statements : DESIGNABLE IDENTIFIER prop_statements",
-"prop_statements : SCRIPTABLE IDENTIFIER prop_statements",
-"qt_enums :",
-"qt_enums : IDENTIFIER qt_enums",
-"qt_sets :",
-"qt_sets : IDENTIFIER qt_sets",
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,    80,     0,    39,    40,    81,    82,    83,    86,    90,
+      91,    92,    93,    94,     7,    87,     7,    36,    39,    38,
+     111,   112,   113,   148,   151,   152,    59,    84,    57,    61,
+       7,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,   105,   106,
+     107,   110,   150,    28,    29,     7,    95,    96,   115,    60,
+      66,    68,    69,    70,   161,   190,    57,     7,    36,   114,
+     115,    57,    88,    97,    61,    95,    36,     7,     7,     7,
+       7,    15,    32,    33,    34,   114,   191,   192,   193,   194,
+     149,   115,    60,    85,    80,    89,    62,    97,    95,    67,
+      66,   114,   192,   194,    63,    15,   114,   192,    43,    44,
+      45,    46,    47,    48,    49,    50,   162,   163,   164,   165,
+     194,    89,    58,    62,     7,   110,   114,   192,   193,   114,
+     192,   167,   168,   170,   172,   174,   176,    58,   165,   166,
+      58,    67,    67,    70,    66,    66,    66,    66,    66,     7,
+      43,    44,    70,   178,     7,     8,     9,    15,    27,    30,
+      35,    39,    40,   101,   104,   105,   106,   107,   108,   109,
+     110,   111,   113,   114,   116,   133,   153,   183,   184,   185,
+     196,   197,   198,   207,     7,   214,   214,     6,     7,   217,
+       7,   218,    70,    70,   179,    59,    64,   136,     7,    57,
+     209,     7,    59,    61,    62,    63,    64,    66,    68,    69,
+      71,    72,    73,    74,    75,    76,    77,    78,   103,   104,
+     195,     7,    39,   114,    27,   101,   108,   113,     7,    35,
+      68,    69,   104,   133,   140,   141,   110,     7,   115,    57,
+      60,   185,    77,    66,    70,   132,   205,     7,   210,     7,
+      67,    67,    63,   217,    67,   218,    67,   186,   187,   188,
+     198,   180,   181,   182,   198,   134,   137,    59,    64,    57,
+       7,   211,   212,    59,    59,    61,    59,    62,    65,    67,
+      59,    59,    69,    59,    71,    59,    62,    72,    59,    59,
+      59,    59,    76,    59,    59,     7,   110,    57,   114,    60,
+       7,   103,     7,   195,    16,    17,   142,   143,   144,   142,
+     139,   140,    35,   133,   141,   161,   199,   189,   133,   102,
+     103,   117,   118,   121,   122,   206,   189,    60,    63,    60,
+     215,   169,   171,     6,   175,   177,   188,   182,    98,    98,
+     135,   138,   211,    59,    63,   208,    59,    59,    68,   139,
+     139,    60,   189,   139,   144,    35,   133,   195,    58,    60,
+      64,    66,   125,   126,   141,   108,    67,    37,   120,    63,
+      98,   189,     7,    66,    70,   129,   131,   201,   202,   189,
+      51,    52,    53,    54,    55,    56,   216,   180,   180,    67,
+     180,   180,    65,    98,    98,   208,   213,   212,    58,   189,
+      35,   133,   195,   200,   127,   126,     7,    59,   131,    64,
+     141,   103,   142,    37,   122,    70,   129,   204,    64,   141,
+      60,    63,     7,     7,     7,     7,     7,     7,   173,    65,
+      58,   100,   195,    60,    98,    67,   123,   125,   128,    70,
+     156,   157,   203,    67,    98,   130,   189,   202,   216,   216,
+     216,   216,   216,   216,   180,   189,    65,    99,    59,    98,
+     114,   158,   159,    42,   154,   155,    98,    98,   124,    65,
+      66,    63,    66,   210,    65,    99,   160,   158,   119,   122,
+      57,    59,    60,   145,   146,    98,    67,   147,     4,    67,
+      58,    60
 };
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		(-2)
+#define YYEOF		0
+
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL		goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include  /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+#else
+static void
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef	YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+
+
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+  yyssp = yyss;
+  yyvsp = yyvs;
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	yytype_int16 *yyss1 = yyss;
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+	yystacksize = YYMAXDEPTH;
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+	YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 11:
+
+/* Line 1455 of yacc.c  */
+#line 824 "moc.y"
+    { enterNameSpace((yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 12:
+
+/* Line 1455 of yacc.c  */
+#line 825 "moc.y"
+    { BEGIN IN_NAMESPACE; }
+    break;
+
+  case 13:
+
+/* Line 1455 of yacc.c  */
+#line 827 "moc.y"
+    { leaveNameSpace();
+					       selectOutsideClassState();
+					     }
+    break;
+
+  case 14:
+
+/* Line 1455 of yacc.c  */
+#line 832 "moc.y"
+    { enterNameSpace(); }
+    break;
+
+  case 15:
+
+/* Line 1455 of yacc.c  */
+#line 833 "moc.y"
+    { BEGIN IN_NAMESPACE; }
+    break;
+
+  case 16:
+
+/* Line 1455 of yacc.c  */
+#line 835 "moc.y"
+    { leaveNameSpace();
+					       selectOutsideClassState();
+					     }
+    break;
+
+  case 18:
+
+/* Line 1455 of yacc.c  */
+#line 844 "moc.y"
+    { selectOutsideClassState(); }
+    break;
+
+  case 19:
+
+/* Line 1455 of yacc.c  */
+#line 848 "moc.y"
+    { selectOutsideClassState(); }
+    break;
+
+  case 20:
+
+/* Line 1455 of yacc.c  */
+#line 851 "moc.y"
+    { selectOutsideClassState(); }
+    break;
+
+  case 21:
+
+/* Line 1455 of yacc.c  */
+#line 852 "moc.y"
+    { selectOutsideClassState(); }
+    break;
+
+  case 22:
+
+/* Line 1455 of yacc.c  */
+#line 855 "moc.y"
+    { initClass(); }
+    break;
+
+  case 23:
+
+/* Line 1455 of yacc.c  */
+#line 856 "moc.y"
+    { generateClass();
+						registerClassInNamespace();
+						selectOutsideClassState(); }
+    break;
+
+  case 24:
+
+/* Line 1455 of yacc.c  */
+#line 864 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 25:
+
+/* Line 1455 of yacc.c  */
+#line 865 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 26:
+
+/* Line 1455 of yacc.c  */
+#line 869 "moc.y"
+    { g->tmpExpression = rmWS( g->tmpExpression );
+				     (yyval.string) = stradd( (yyvsp[(1) - (4)].string), "<",
+						  g->tmpExpression, ">" ); }
+    break;
+
+  case 27:
+
+/* Line 1455 of yacc.c  */
+#line 880 "moc.y"
+    { initExpression();
+						    templLevel = 1;
+						    BEGIN IN_TEMPL_ARGS; }
+    break;
+
+  case 28:
+
+/* Line 1455 of yacc.c  */
+#line 893 "moc.y"
+    { initExpression();
+						    BEGIN IN_EXPR; }
+    break;
+
+  case 29:
+
+/* Line 1455 of yacc.c  */
+#line 902 "moc.y"
+    { BEGIN IN_DEF_ARG; }
+    break;
+
+  case 30:
+
+/* Line 1455 of yacc.c  */
+#line 905 "moc.y"
+    { initExpression();
+						    BEGIN IN_ENUM; }
+    break;
+
+  case 31:
+
+/* Line 1455 of yacc.c  */
+#line 911 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 32:
+
+/* Line 1455 of yacc.c  */
+#line 912 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 33:
+
+/* Line 1455 of yacc.c  */
+#line 913 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 34:
+
+/* Line 1455 of yacc.c  */
+#line 914 "moc.y"
+    { skipFunc = TRUE; (yyval.string) = ""; }
+    break;
+
+  case 35:
+
+/* Line 1455 of yacc.c  */
+#line 915 "moc.y"
+    { skipFunc = TRUE; (yyval.string) = ""; }
+    break;
+
+  case 36:
+
+/* Line 1455 of yacc.c  */
+#line 919 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (3)].string),(yyvsp[(2) - (3)].string),(yyvsp[(3) - (3)].string)); }
+    break;
+
+  case 37:
+
+/* Line 1455 of yacc.c  */
+#line 921 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 38:
+
+/* Line 1455 of yacc.c  */
+#line 922 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 39:
+
+/* Line 1455 of yacc.c  */
+#line 925 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 40:
+
+/* Line 1455 of yacc.c  */
+#line 926 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 43:
+
+/* Line 1455 of yacc.c  */
+#line 931 "moc.y"
+    { skipFunc = TRUE; }
+    break;
+
+  case 45:
+
+/* Line 1455 of yacc.c  */
+#line 935 "moc.y"
+    { }
+    break;
+
+  case 46:
+
+/* Line 1455 of yacc.c  */
+#line 936 "moc.y"
+    { }
+    break;
+
+  case 47:
+
+/* Line 1455 of yacc.c  */
+#line 939 "moc.y"
+    { (yyval.string) = "const"; }
+    break;
+
+  case 48:
+
+/* Line 1455 of yacc.c  */
+#line 940 "moc.y"
+    { (yyval.string) = "volatile"; }
+    break;
+
+  case 49:
+
+/* Line 1455 of yacc.c  */
+#line 943 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 50:
+
+/* Line 1455 of yacc.c  */
+#line 944 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 51:
+
+/* Line 1455 of yacc.c  */
+#line 945 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 52:
+
+/* Line 1455 of yacc.c  */
+#line 949 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 53:
+
+/* Line 1455 of yacc.c  */
+#line 950 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 54:
+
+/* Line 1455 of yacc.c  */
+#line 953 "moc.y"
+    { (yyval.string) = "char"; }
+    break;
+
+  case 55:
+
+/* Line 1455 of yacc.c  */
+#line 954 "moc.y"
+    { (yyval.string) = "short"; }
+    break;
+
+  case 56:
+
+/* Line 1455 of yacc.c  */
+#line 955 "moc.y"
+    { (yyval.string) = "int"; }
+    break;
+
+  case 57:
+
+/* Line 1455 of yacc.c  */
+#line 956 "moc.y"
+    { (yyval.string) = "long"; }
+    break;
+
+  case 58:
+
+/* Line 1455 of yacc.c  */
+#line 957 "moc.y"
+    { (yyval.string) = "signed"; }
+    break;
+
+  case 59:
+
+/* Line 1455 of yacc.c  */
+#line 958 "moc.y"
+    { (yyval.string) = "unsigned"; }
+    break;
+
+  case 60:
+
+/* Line 1455 of yacc.c  */
+#line 959 "moc.y"
+    { (yyval.string) = "float"; }
+    break;
+
+  case 61:
+
+/* Line 1455 of yacc.c  */
+#line 960 "moc.y"
+    { (yyval.string) = "double"; }
+    break;
+
+  case 62:
+
+/* Line 1455 of yacc.c  */
+#line 961 "moc.y"
+    { (yyval.string) = "void"; }
+    break;
+
+  case 63:
+
+/* Line 1455 of yacc.c  */
+#line 965 "moc.y"
+    { g->tmpExpression = rmWS( g->tmpExpression );
+				     (yyval.string) = stradd( "template<",
+						  g->tmpExpression, ">" ); }
+    break;
+
+  case 65:
+
+/* Line 1455 of yacc.c  */
+#line 971 "moc.y"
+    { templateClassOld = templateClass;
+						  templateClass = TRUE;
+						}
+    break;
+
+  case 66:
+
+/* Line 1455 of yacc.c  */
+#line 977 "moc.y"
+    { (yyval.string) = "class"; }
+    break;
+
+  case 67:
+
+/* Line 1455 of yacc.c  */
+#line 978 "moc.y"
+    { (yyval.string) = "struct"; }
+    break;
+
+  case 68:
+
+/* Line 1455 of yacc.c  */
+#line 981 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 69:
+
+/* Line 1455 of yacc.c  */
+#line 983 "moc.y"
+    { (yyval.string) = stradd( "::", (yyvsp[(2) - (2)].string) ); }
+    break;
+
+  case 70:
+
+/* Line 1455 of yacc.c  */
+#line 987 "moc.y"
+    { (yyval.string) = stradd( (yyvsp[(1) - (3)].string), "::", (yyvsp[(3) - (3)].string) );}
+    break;
+
+  case 71:
+
+/* Line 1455 of yacc.c  */
+#line 988 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 72:
+
+/* Line 1455 of yacc.c  */
+#line 992 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 73:
+
+/* Line 1455 of yacc.c  */
+#line 993 "moc.y"
+    { (yyval.string) = stradd("enum ",(yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 74:
+
+/* Line 1455 of yacc.c  */
+#line 994 "moc.y"
+    { (yyval.string) = stradd("union ",(yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 75:
+
+/* Line 1455 of yacc.c  */
+#line 999 "moc.y"
+    { (yyval.arg_list) = (yyvsp[(1) - (2)].arg_list);}
+    break;
+
+  case 76:
+
+/* Line 1455 of yacc.c  */
+#line 1000 "moc.y"
+    { (yyval.arg_list) = (yyvsp[(1) - (3)].arg_list);
+				       func_warn("Ellipsis not supported"
+						 " in signals and slots.\n"
+						 "Ellipsis argument ignored."); }
+    break;
+
+  case 77:
+
+/* Line 1455 of yacc.c  */
+#line 1006 "moc.y"
+    { (yyval.arg_list) = tmpArgList; }
+    break;
+
+  case 78:
+
+/* Line 1455 of yacc.c  */
+#line 1007 "moc.y"
+    { (yyval.arg_list) = (yyvsp[(1) - (1)].arg_list); }
+    break;
+
+  case 79:
+
+/* Line 1455 of yacc.c  */
+#line 1010 "moc.y"
+    { (yyval.arg) = 0; }
+    break;
+
+  case 82:
+
+/* Line 1455 of yacc.c  */
+#line 1015 "moc.y"
+    { func_warn("Ellipsis not supported"
+						 " in signals and slots.\n"
+						 "Ellipsis argument ignored."); }
+    break;
+
+  case 83:
+
+/* Line 1455 of yacc.c  */
+#line 1023 "moc.y"
+    { (yyval.arg_list) = addArg((yyvsp[(3) - (3)].arg)); }
+    break;
+
+  case 84:
+
+/* Line 1455 of yacc.c  */
+#line 1024 "moc.y"
+    { (yyval.arg_list) = addArg((yyvsp[(1) - (1)].arg)); }
+    break;
+
+  case 85:
+
+/* Line 1455 of yacc.c  */
+#line 1028 "moc.y"
+    { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)),""); }
+    break;
+
+  case 86:
+
+/* Line 1455 of yacc.c  */
+#line 1030 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 87:
+
+/* Line 1455 of yacc.c  */
+#line 1032 "moc.y"
+    { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (5)].string),(yyvsp[(2) - (5)].string)),"", 0, TRUE ); }
+    break;
+
+  case 88:
+
+/* Line 1455 of yacc.c  */
+#line 1035 "moc.y"
+    { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (4)].string),(yyvsp[(2) - (4)].string)),(yyvsp[(4) - (4)].string), (yyvsp[(3) - (4)].string)); }
+    break;
+
+  case 89:
+
+/* Line 1455 of yacc.c  */
+#line 1038 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 90:
+
+/* Line 1455 of yacc.c  */
+#line 1040 "moc.y"
+    { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (7)].string),(yyvsp[(2) - (7)].string)),(yyvsp[(4) - (7)].string), (yyvsp[(3) - (7)].string), TRUE); }
+    break;
+
+  case 91:
+
+/* Line 1455 of yacc.c  */
+#line 1044 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 92:
+
+/* Line 1455 of yacc.c  */
+#line 1045 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 93:
+
+/* Line 1455 of yacc.c  */
+#line 1049 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 94:
+
+/* Line 1455 of yacc.c  */
+#line 1050 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 95:
+
+/* Line 1455 of yacc.c  */
+#line 1052 "moc.y"
+    { (yyval.string) = stradd( "[",
+				     g->tmpExpression =
+				     g->tmpExpression.stripWhiteSpace(), "]" ); }
+    break;
+
+  case 96:
+
+/* Line 1455 of yacc.c  */
+#line 1055 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 97:
+
+/* Line 1455 of yacc.c  */
+#line 1057 "moc.y"
+    { (yyval.string) = stradd( (yyvsp[(1) - (5)].string),"[",
+				     g->tmpExpression =
+				     g->tmpExpression.stripWhiteSpace(),"]" ); }
+    break;
+
+  case 98:
+
+/* Line 1455 of yacc.c  */
+#line 1060 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 99:
+
+/* Line 1455 of yacc.c  */
+#line 1061 "moc.y"
+    { (yyval.string) = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 100:
+
+/* Line 1455 of yacc.c  */
+#line 1064 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 101:
+
+/* Line 1455 of yacc.c  */
+#line 1066 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string));}
+    break;
+
+  case 102:
+
+/* Line 1455 of yacc.c  */
+#line 1067 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 103:
+
+/* Line 1455 of yacc.c  */
+#line 1069 "moc.y"
+    { (yyval.string) = stradd( (yyvsp[(1) - (5)].string),"[",
+				     g->tmpExpression =
+				     g->tmpExpression.stripWhiteSpace(),"]" ); }
+    break;
+
+  case 104:
+
+/* Line 1455 of yacc.c  */
+#line 1072 "moc.y"
+    { (yyval.string) = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 106:
+
+/* Line 1455 of yacc.c  */
+#line 1086 "moc.y"
+    { tmpFunc->args	     = (yyvsp[(2) - (8)].arg_list);
+						  tmpFunc->qualifier = (yyvsp[(4) - (8)].string); }
+    break;
+
+  case 108:
+
+/* Line 1455 of yacc.c  */
+#line 1092 "moc.y"
+    { func_warn("Variable as signal or slot."); }
+    break;
+
+  case 109:
+
+/* Line 1455 of yacc.c  */
+#line 1093 "moc.y"
+    { expLevel=0; }
+    break;
+
+  case 110:
+
+/* Line 1455 of yacc.c  */
+#line 1095 "moc.y"
+    { skipFunc = TRUE; }
+    break;
+
+  case 111:
+
+/* Line 1455 of yacc.c  */
+#line 1096 "moc.y"
+    { expLevel=0; }
+    break;
+
+  case 112:
+
+/* Line 1455 of yacc.c  */
+#line 1098 "moc.y"
+    { skipFunc = TRUE; }
+    break;
+
+  case 113:
+
+/* Line 1455 of yacc.c  */
+#line 1102 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 115:
+
+/* Line 1455 of yacc.c  */
+#line 1104 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 117:
+
+/* Line 1455 of yacc.c  */
+#line 1109 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 118:
+
+/* Line 1455 of yacc.c  */
+#line 1110 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 119:
+
+/* Line 1455 of yacc.c  */
+#line 1113 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 120:
+
+/* Line 1455 of yacc.c  */
+#line 1114 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string));}
+    break;
+
+  case 121:
+
+/* Line 1455 of yacc.c  */
+#line 1117 "moc.y"
+    { (yyval.string) = straddSpc("*",(yyvsp[(2) - (2)].string));}
+    break;
+
+  case 122:
+
+/* Line 1455 of yacc.c  */
+#line 1118 "moc.y"
+    { (yyval.string) = stradd("&",(yyvsp[(2) - (2)].string));}
+    break;
+
+  case 123:
+
+/* Line 1455 of yacc.c  */
+#line 1125 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 124:
+
+/* Line 1455 of yacc.c  */
+#line 1126 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 125:
+
+/* Line 1455 of yacc.c  */
+#line 1129 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 126:
+
+/* Line 1455 of yacc.c  */
+#line 1131 "moc.y"
+    { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); }
+    break;
+
+  case 127:
+
+/* Line 1455 of yacc.c  */
+#line 1134 "moc.y"
+    { (yyval.string) = "const"; }
+    break;
+
+  case 128:
+
+/* Line 1455 of yacc.c  */
+#line 1135 "moc.y"
+    { (yyval.string) = "volatile"; }
+    break;
+
+  case 132:
+
+/* Line 1455 of yacc.c  */
+#line 1143 "moc.y"
+    { BEGIN IN_FCT; fctLevel = 1;}
+    break;
+
+  case 133:
+
+/* Line 1455 of yacc.c  */
+#line 1144 "moc.y"
+    { BEGIN QT_DEF; }
+    break;
+
+  case 134:
+
+/* Line 1455 of yacc.c  */
+#line 1151 "moc.y"
+    { BEGIN IN_CLASS;
+						  classPLevel = 1;
+						}
+    break;
+
+  case 135:
+
+/* Line 1455 of yacc.c  */
+#line 1155 "moc.y"
+    { BEGIN QT_DEF; }
+    break;
+
+  case 136:
+
+/* Line 1455 of yacc.c  */
+#line 1156 "moc.y"
+    { BEGIN QT_DEF;	  /* -- " -- */
+						  skipClass = TRUE; }
+    break;
+
+  case 137:
+
+/* Line 1455 of yacc.c  */
+#line 1158 "moc.y"
+    { BEGIN QT_DEF;	  /* -- " -- */
+ 						  skipClass = TRUE; }
+    break;
+
+  case 138:
+
+/* Line 1455 of yacc.c  */
+#line 1160 "moc.y"
+    { BEGIN QT_DEF;	  /* -- " -- */
+ 						  skipClass = TRUE; }
+    break;
+
+  case 139:
+
+/* Line 1455 of yacc.c  */
+#line 1164 "moc.y"
+    { BEGIN QT_DEF; /* catch ';' */
+						  skipClass = TRUE; }
+    break;
+
+  case 140:
+
+/* Line 1455 of yacc.c  */
+#line 1166 "moc.y"
+    { skipClass = TRUE;
+						  BEGIN GIMME_SEMICOLON; }
+    break;
+
+  case 144:
+
+/* Line 1455 of yacc.c  */
+#line 1173 "moc.y"
+    { (yyval.string) = ""; }
+    break;
+
+  case 146:
+
+/* Line 1455 of yacc.c  */
+#line 1179 "moc.y"
+    { g->className = (yyvsp[(2) - (2)].string);
+						  if ( g->className == "TQObject" )
+						     TQ_OBJECTdetected = TRUE;
+						}
+    break;
+
+  case 147:
+
+/* Line 1455 of yacc.c  */
+#line 1185 "moc.y"
+    { g->className = (yyvsp[(3) - (3)].string);
+						  if ( g->className == "TQObject" )
+						     TQ_OBJECTdetected = TRUE;
+						}
+    break;
+
+  case 148:
+
+/* Line 1455 of yacc.c  */
+#line 1192 "moc.y"
+    { g->superClassName = (yyvsp[(2) - (2)].string); }
+    break;
+
+  case 149:
+
+/* Line 1455 of yacc.c  */
+#line 1197 "moc.y"
+    { templateClass = templateClassOld; }
+    break;
+
+  case 158:
+
+/* Line 1455 of yacc.c  */
+#line 1220 "moc.y"
+    { expLevel = 1; }
+    break;
+
+  case 160:
+
+/* Line 1455 of yacc.c  */
+#line 1225 "moc.y"
+    { (yyval.string) = 0; }
+    break;
+
+  case 161:
+
+/* Line 1455 of yacc.c  */
+#line 1226 "moc.y"
+    { (yyval.string) = (yyvsp[(1) - (1)].string); }
+    break;
+
+  case 166:
+
+/* Line 1455 of yacc.c  */
+#line 1238 "moc.y"
+    { tmpAccess = (yyvsp[(1) - (1)].access); }
+    break;
+
+  case 167:
+
+/* Line 1455 of yacc.c  */
+#line 1239 "moc.y"
+    { moc_err( "Missing access specifier"
+						   " before \"slots:\"." ); }
+    break;
+
+  case 168:
+
+/* Line 1455 of yacc.c  */
+#line 1243 "moc.y"
+    { BEGIN QT_DEF; }
+    break;
+
+  case 170:
+
+/* Line 1455 of yacc.c  */
+#line 1245 "moc.y"
+    { BEGIN QT_DEF; }
+    break;
+
+  case 172:
+
+/* Line 1455 of yacc.c  */
+#line 1247 "moc.y"
+    {
+			      if ( tmpAccess )
+				  moc_warn("TQ_OBJECT is not in the private"
+					   " section of the class.\n"
+					   "TQ_OBJECT is a macro that resets"
+					   " access permission to \"private\".");
+			      TQ_OBJECTdetected = TRUE;
+			  }
+    break;
+
+  case 173:
+
+/* Line 1455 of yacc.c  */
+#line 1255 "moc.y"
+    { tmpYYStart = YY_START;
+				       tmpPropOverride = FALSE;
+				       BEGIN IN_PROPERTY; }
+    break;
+
+  case 174:
+
+/* Line 1455 of yacc.c  */
+#line 1258 "moc.y"
+    {
+						BEGIN tmpYYStart;
+					   }
+    break;
+
+  case 176:
+
+/* Line 1455 of yacc.c  */
+#line 1262 "moc.y"
+    { tmpYYStart = YY_START;
+				       tmpPropOverride = TRUE;
+				       BEGIN IN_PROPERTY; }
+    break;
+
+  case 177:
+
+/* Line 1455 of yacc.c  */
+#line 1265 "moc.y"
+    {
+						BEGIN tmpYYStart;
+					   }
+    break;
+
+  case 179:
+
+/* Line 1455 of yacc.c  */
+#line 1269 "moc.y"
+    { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; }
+    break;
+
+  case 180:
+
+/* Line 1455 of yacc.c  */
+#line 1271 "moc.y"
+    {
+				      g->infos.append( new ClassInfo( (yyvsp[(4) - (7)].string), (yyvsp[(6) - (7)].string) ) );
+				      BEGIN tmpYYStart;
+				  }
+    break;
+
+  case 182:
+
+/* Line 1455 of yacc.c  */
+#line 1276 "moc.y"
+    { tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
+    break;
+
+  case 183:
+
+/* Line 1455 of yacc.c  */
+#line 1277 "moc.y"
+    {
+						Q_PROPERTYdetected = TRUE;
+						BEGIN tmpYYStart;
+					   }
+    break;
+
+  case 185:
+
+/* Line 1455 of yacc.c  */
+#line 1282 "moc.y"
+    { tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
+    break;
+
+  case 186:
+
+/* Line 1455 of yacc.c  */
+#line 1283 "moc.y"
+    {
+						Q_PROPERTYdetected = TRUE;
+						BEGIN tmpYYStart;
+					   }
+    break;
+
+  case 188:
+
+/* Line 1455 of yacc.c  */
+#line 1290 "moc.y"
+    { moc_err( "Signals cannot "
+						 "have access specifiers" ); }
+    break;
+
+  case 190:
+
+/* Line 1455 of yacc.c  */
+#line 1293 "moc.y"
+    { if ( tmpAccess == Public && Q_PROPERTYdetected )
+						  BEGIN QT_DEF;
+					      else
+						  BEGIN IN_CLASS;
+					  suppress_func_warn = TRUE;
+					}
+    break;
+
+  case 191:
+
+/* Line 1455 of yacc.c  */
+#line 1300 "moc.y"
+    {
+					  suppress_func_warn = FALSE;
+					}
+    break;
+
+  case 192:
+
+/* Line 1455 of yacc.c  */
+#line 1303 "moc.y"
+    { BEGIN IN_CLASS;
+					   if ( classPLevel != 1 )
+					       moc_warn( "unexpected access"
+							 "specifier" );
+					}
+    break;
+
+  case 197:
+
+/* Line 1455 of yacc.c  */
+#line 1318 "moc.y"
+    { addMember( PropertyCandidateMember ); }
+    break;
+
+  case 202:
+
+/* Line 1455 of yacc.c  */
+#line 1330 "moc.y"
+    { addMember( SignalMember ); }
+    break;
+
+  case 207:
+
+/* Line 1455 of yacc.c  */
+#line 1341 "moc.y"
+    { addMember( SlotMember ); }
+    break;
+
+  case 210:
+
+/* Line 1455 of yacc.c  */
+#line 1348 "moc.y"
+    { (yyval.string)=(yyvsp[(2) - (2)].string); }
+    break;
+
+  case 211:
+
+/* Line 1455 of yacc.c  */
+#line 1351 "moc.y"
+    { g->multipleSuperClasses.append( (yyvsp[(3) - (3)].string) ); }
+    break;
+
+  case 213:
+
+/* Line 1455 of yacc.c  */
+#line 1356 "moc.y"
+    { (yyval.string) = stradd( (yyvsp[(1) - (4)].string), "(", (yyvsp[(3) - (4)].string), ")" ); }
+    break;
+
+  case 214:
+
+/* Line 1455 of yacc.c  */
+#line 1358 "moc.y"
+    { (yyval.string) = stradd( (yyvsp[(1) - (4)].string), "(", (yyvsp[(3) - (4)].string), ")" ); }
+    break;
+
+  case 215:
+
+/* Line 1455 of yacc.c  */
+#line 1361 "moc.y"
+    {(yyval.string)=(yyvsp[(1) - (1)].string);}
+    break;
+
+  case 216:
+
+/* Line 1455 of yacc.c  */
+#line 1362 "moc.y"
+    {(yyval.string)=(yyvsp[(3) - (3)].string);}
+    break;
+
+  case 217:
+
+/* Line 1455 of yacc.c  */
+#line 1363 "moc.y"
+    {(yyval.string)=(yyvsp[(2) - (2)].string);}
+    break;
+
+  case 218:
+
+/* Line 1455 of yacc.c  */
+#line 1364 "moc.y"
+    {(yyval.string)=(yyvsp[(3) - (3)].string);}
+    break;
+
+  case 219:
+
+/* Line 1455 of yacc.c  */
+#line 1365 "moc.y"
+    {(yyval.string)=(yyvsp[(2) - (2)].string);}
+    break;
+
+  case 220:
+
+/* Line 1455 of yacc.c  */
+#line 1366 "moc.y"
+    {(yyval.string)=(yyvsp[(1) - (1)].string);}
+    break;
+
+  case 221:
+
+/* Line 1455 of yacc.c  */
+#line 1367 "moc.y"
+    {(yyval.string)=(yyvsp[(3) - (3)].string);}
+    break;
+
+  case 222:
+
+/* Line 1455 of yacc.c  */
+#line 1368 "moc.y"
+    {(yyval.string)=(yyvsp[(2) - (2)].string);}
+    break;
+
+  case 223:
+
+/* Line 1455 of yacc.c  */
+#line 1369 "moc.y"
+    {(yyval.string)=(yyvsp[(3) - (3)].string);}
+    break;
+
+  case 224:
+
+/* Line 1455 of yacc.c  */
+#line 1370 "moc.y"
+    {(yyval.string)=(yyvsp[(2) - (2)].string);}
+    break;
+
+  case 225:
+
+/* Line 1455 of yacc.c  */
+#line 1373 "moc.y"
+    { (yyval.access)=Private; }
+    break;
+
+  case 226:
+
+/* Line 1455 of yacc.c  */
+#line 1374 "moc.y"
+    { (yyval.access)=Protected; }
+    break;
+
+  case 227:
+
+/* Line 1455 of yacc.c  */
+#line 1375 "moc.y"
+    { (yyval.access)=Public; }
+    break;
+
+  case 228:
+
+/* Line 1455 of yacc.c  */
+#line 1378 "moc.y"
+    { }
+    break;
+
+  case 229:
+
+/* Line 1455 of yacc.c  */
+#line 1379 "moc.y"
+    { }
+    break;
+
+  case 271:
+
+/* Line 1455 of yacc.c  */
+#line 1427 "moc.y"
+    { tmpFunc->type = (yyvsp[(1) - (2)].string);
+						  tmpFunc->name = (yyvsp[(2) - (2)].string); }
+    break;
+
+  case 272:
+
+/* Line 1455 of yacc.c  */
+#line 1430 "moc.y"
+    { tmpFunc->type = "int";
+						  tmpFunc->name = (yyvsp[(1) - (1)].string);
+				  if ( tmpFunc->name == g->className )
+				      func_warn( "Constructors cannot be"
+						 " signals or slots.");
+						}
+    break;
+
+  case 273:
+
+/* Line 1455 of yacc.c  */
+#line 1437 "moc.y"
+    { tmpFunc->type = "void";
+						  tmpFunc->name = "~";
+						  tmpFunc->name += (yyvsp[(3) - (3)].string);
+				       func_warn( "Destructors cannot be"
+						  " signals or slots.");
+						}
+    break;
+
+  case 274:
+
+/* Line 1455 of yacc.c  */
+#line 1445 "moc.y"
+    {
+						    char *tmp =
+							straddSpc((yyvsp[(1) - (5)].string),(yyvsp[(2) - (5)].string),(yyvsp[(3) - (5)].string),(yyvsp[(4) - (5)].string));
+						    tmpFunc->type = rmWS(tmp);
+						    delete [] tmp;
+						    tmpFunc->name = (yyvsp[(5) - (5)].string); }
+    break;
+
+  case 275:
+
+/* Line 1455 of yacc.c  */
+#line 1452 "moc.y"
+    { skipFunc = TRUE; }
+    break;
+
+  case 276:
+
+/* Line 1455 of yacc.c  */
+#line 1454 "moc.y"
+    { tmpFunc->type =
+						      straddSpc((yyvsp[(1) - (3)].string),(yyvsp[(2) - (3)].string));
+						  tmpFunc->name = (yyvsp[(3) - (3)].string); }
+    break;
+
+  case 277:
+
+/* Line 1455 of yacc.c  */
+#line 1459 "moc.y"
+    { tmpFunc->type =
+						      straddSpc((yyvsp[(1) - (4)].string),(yyvsp[(2) - (4)].string),(yyvsp[(3) - (4)].string));
+						  tmpFunc->name = (yyvsp[(4) - (4)].string); }
+    break;
+
+  case 278:
+
+/* Line 1455 of yacc.c  */
+#line 1463 "moc.y"
+    { operatorError();    }
+    break;
+
+  case 279:
+
+/* Line 1455 of yacc.c  */
+#line 1465 "moc.y"
+    { operatorError();    }
+    break;
+
+  case 280:
+
+/* Line 1455 of yacc.c  */
+#line 1468 "moc.y"
+    { operatorError();    }
+    break;
+
+  case 281:
+
+/* Line 1455 of yacc.c  */
+#line 1470 "moc.y"
+    { operatorError();    }
+    break;
+
+  case 282:
+
+/* Line 1455 of yacc.c  */
+#line 1473 "moc.y"
+    { operatorError();    }
+    break;
+
+  case 284:
+
+/* Line 1455 of yacc.c  */
+#line 1479 "moc.y"
+    { func_warn("Unexpected variable declaration."); }
+    break;
+
+  case 285:
+
+/* Line 1455 of yacc.c  */
+#line 1482 "moc.y"
+    { func_warn("Unexpected variable declaration."); }
+    break;
+
+  case 286:
+
+/* Line 1455 of yacc.c  */
+#line 1484 "moc.y"
+    { func_warn("Unexpected enum declaration."); }
+    break;
+
+  case 287:
+
+/* Line 1455 of yacc.c  */
+#line 1486 "moc.y"
+    { func_warn("Unexpected using declaration."); }
+    break;
+
+  case 288:
+
+/* Line 1455 of yacc.c  */
+#line 1488 "moc.y"
+    { func_warn("Unexpected using declaration."); }
+    break;
+
+  case 289:
+
+/* Line 1455 of yacc.c  */
+#line 1490 "moc.y"
+    { classPLevel++;
+				  moc_err("Unexpected namespace declaration."); }
+    break;
+
+  case 290:
+
+/* Line 1455 of yacc.c  */
+#line 1493 "moc.y"
+    { func_warn("Unexpected class declaration.");}
+    break;
+
+  case 291:
+
+/* Line 1455 of yacc.c  */
+#line 1495 "moc.y"
+    { func_warn("Unexpected class declaration.");
+				  BEGIN IN_FCT; fctLevel=1;
+				}
+    break;
+
+  case 292:
+
+/* Line 1455 of yacc.c  */
+#line 1498 "moc.y"
+    { BEGIN QT_DEF; }
+    break;
+
+  case 296:
+
+/* Line 1455 of yacc.c  */
+#line 1507 "moc.y"
+    { }
+    break;
+
+  case 297:
+
+/* Line 1455 of yacc.c  */
+#line 1508 "moc.y"
+    { expLevel = 0; }
+    break;
+
+  case 299:
+
+/* Line 1455 of yacc.c  */
+#line 1510 "moc.y"
+    { expLevel = 0; }
+    break;
+
+  case 302:
+
+/* Line 1455 of yacc.c  */
+#line 1515 "moc.y"
+    { expLevel = 0; }
+    break;
+
+  case 307:
+
+/* Line 1455 of yacc.c  */
+#line 1530 "moc.y"
+    { BEGIN QT_DEF;
+				  if ( tmpAccess == Public) {
+				      tmpEnum->name = (yyvsp[(1) - (5)].string);
+				      addEnum();
+				  }
+				}
+    break;
+
+  case 308:
+
+/* Line 1455 of yacc.c  */
+#line 1537 "moc.y"
+    { tmpEnum->clear();}
+    break;
+
+  case 310:
+
+/* Line 1455 of yacc.c  */
+#line 1541 "moc.y"
+    { }
+    break;
+
+  case 314:
+
+/* Line 1455 of yacc.c  */
+#line 1549 "moc.y"
+    { if ( tmpAccess == Public) tmpEnum->append( (yyvsp[(1) - (1)].string) ); }
+    break;
+
+  case 315:
+
+/* Line 1455 of yacc.c  */
+#line 1550 "moc.y"
+    { enumLevel=0; }
+    break;
+
+  case 316:
+
+/* Line 1455 of yacc.c  */
+#line 1551 "moc.y"
+    {  if ( tmpAccess == Public) tmpEnum->append( (yyvsp[(1) - (4)].string) );  }
+    break;
+
+  case 317:
+
+/* Line 1455 of yacc.c  */
+#line 1555 "moc.y"
+    {
+				     g->propWrite = "";
+				     g->propRead = "";
+				     g->propOverride = tmpPropOverride;
+				     g->propReset = "";
+				     if ( g->propOverride ) {
+					 g->propStored = "";
+					 g->propDesignable = "";
+					 g->propScriptable = "";
+				     } else {
+					 g->propStored = "true";
+					 g->propDesignable = "true";
+					 g->propScriptable = "true";
+				     }
+				}
+    break;
+
+  case 318:
+
+/* Line 1455 of yacc.c  */
+#line 1571 "moc.y"
+    {
+				    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;
+				    // Avoid duplicates
+				    for( TQPtrListIterator lit( g->props ); lit.current(); ++lit ) {
+					if ( lit.current()->name == (yyvsp[(2) - (4)].string) ) {
+					    if ( displayWarnings )
+						moc_err( "Property '%s' defined twice.",
+							 (const char*)lit.current()->name );
+					}
+				    }
+				    g->props.append( new Property( lineNo, (yyvsp[(1) - (4)].string), (yyvsp[(2) - (4)].string),
+								g->propWrite, g->propRead, g->propReset,
+								   g->propStored, g->propDesignable,
+								   g->propScriptable, g->propOverride ) );
+				}
+    break;
+
+  case 320:
+
+/* Line 1455 of yacc.c  */
+#line 1592 "moc.y"
+    { g->propRead = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 321:
+
+/* Line 1455 of yacc.c  */
+#line 1593 "moc.y"
+    { g->propWrite = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 322:
+
+/* Line 1455 of yacc.c  */
+#line 1594 "moc.y"
+    { g->propReset = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 323:
+
+/* Line 1455 of yacc.c  */
+#line 1595 "moc.y"
+    { g->propStored = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 324:
+
+/* Line 1455 of yacc.c  */
+#line 1596 "moc.y"
+    { g->propDesignable = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 325:
+
+/* Line 1455 of yacc.c  */
+#line 1597 "moc.y"
+    { g->propScriptable = (yyvsp[(2) - (3)].string); }
+    break;
+
+  case 326:
+
+/* Line 1455 of yacc.c  */
+#line 1600 "moc.y"
+    { }
+    break;
+
+  case 327:
+
+/* Line 1455 of yacc.c  */
+#line 1601 "moc.y"
+    { g->qtEnums.append( (yyvsp[(1) - (2)].string) ); }
+    break;
+
+  case 328:
+
+/* Line 1455 of yacc.c  */
+#line 1604 "moc.y"
+    { }
+    break;
+
+  case 329:
+
+/* Line 1455 of yacc.c  */
+#line 1605 "moc.y"
+    { g->qtSets.append( (yyvsp[(1) - (2)].string) ); }
+    break;
+
+
+
+/* Line 1455 of yacc.c  */
+#line 4222 "moc_yacc"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
+
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
+
+
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  *++yyvsp = yylval;
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined(yyoverflow) || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
 #endif
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
+
+yyreturn:
+  if (yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
 #endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
-#line 1606 "moc.y"
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+
+/* Line 1675 of yacc.c  */
+#line 1608 "moc.y"
+
 
 #ifndef YYBISON
 # if defined(Q_OS_WIN32)
@@ -1773,7 +4560,7 @@ int main( int argc, char **argv )
 	    } else if ( opt == "v" ) {		// version number
 		fprintf( stderr, "TQt Meta Object Compiler version %d"
 				 " (TQt %s)\n", formatRevision,
-				 QT_VERSION_STR );
+				 TQT_VERSION_STR );
 		cleanup();
 		return 1;
 	    } else if ( opt == "k" ) {		// stop on errors
@@ -2057,7 +4844,7 @@ void initClass()				 // prepare for new class
 {
     tmpAccess      = Private;
     subClassPerm       = Private;
-    Q_OBJECTdetected   = FALSE;
+    TQ_OBJECTdetected   = FALSE;
     Q_PROPERTYdetected = FALSE;
     skipClass	       = FALSE;
     templateClass      = FALSE;
@@ -2193,7 +4980,7 @@ inline bool isSpace( char x )
 
 static TQCString rmWS( const char *src )
 {
-    TQCString result( qstrlen(src)+1 );
+    TQCString result( tqstrlen(src)+1 );
     char *d = result.data();
     char *s = (char *)src;
     char last = 0;
@@ -2293,7 +5080,7 @@ int yywrap()					// more files?
 
 char *stradd( const char *s1, const char *s2 )	// adds two strings
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+1];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+1];
     qstrcpy( n, s1 );
     strcat( n, s2 );
     return n;
@@ -2301,7 +5088,7 @@ char *stradd( const char *s1, const char *s2 )	// adds two strings
 
 char *stradd( const char *s1, const char *s2, const char *s3 )// adds 3 strings
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+1];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+1];
     qstrcpy( n, s1 );
     strcat( n, s2 );
     strcat( n, s3 );
@@ -2311,7 +5098,7 @@ char *stradd( const char *s1, const char *s2, const char *s3 )// adds 3 strings
 char *stradd( const char *s1, const char *s2,
 	      const char *s3, const char *s4 )// adds 4 strings
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+qstrlen(s4)+1];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+tqstrlen(s4)+1];
     qstrcpy( n, s1 );
     strcat( n, s2 );
     strcat( n, s3 );
@@ -2322,7 +5109,7 @@ char *stradd( const char *s1, const char *s2,
 
 char *straddSpc( const char *s1, const char *s2 )
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+2];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+2];
     qstrcpy( n, s1 );
     strcat( n, " " );
     strcat( n, s2 );
@@ -2331,7 +5118,7 @@ char *straddSpc( const char *s1, const char *s2 )
 
 char *straddSpc( const char *s1, const char *s2, const char *s3 )
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+3];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+3];
     qstrcpy( n, s1 );
     strcat( n, " " );
     strcat( n, s2 );
@@ -2343,7 +5130,7 @@ char *straddSpc( const char *s1, const char *s2, const char *s3 )
 char *straddSpc( const char *s1, const char *s2,
 	      const char *s3, const char *s4 )
 {
-    char *n = new char[qstrlen(s1)+qstrlen(s2)+qstrlen(s3)+qstrlen(s4)+4];
+    char *n = new char[tqstrlen(s1)+tqstrlen(s2)+tqstrlen(s3)+tqstrlen(s4)+4];
     qstrcpy( n, s1 );
     strcat( n, " " );
     strcat( n, s2 );
@@ -2770,9 +5557,9 @@ int generateProps()
     // Create meta data
     //
     if ( g->props.count() )   {
-	if ( displayWarnings && !Q_OBJECTdetected )
+	if ( displayWarnings && !TQ_OBJECTdetected )
 		moc_err("The declaration of the class \"%s\" contains properties"
-		" but no Q_OBJECT macro.", g->className.data());
+		" but no TQ_OBJECT macro.", g->className.data());
 
 	fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
 
@@ -2852,9 +5639,9 @@ int generateClassInfos()
     if ( g->infos.isEmpty() )
 	return 0;
 
-    if ( displayWarnings && !Q_OBJECTdetected )
+    if ( displayWarnings && !TQ_OBJECTdetected )
 	moc_err("The declaration of the class \"%s\" contains class infos"
-		" but no Q_OBJECT macro.", g->className.data());
+		" but no TQ_OBJECT macro.", g->className.data());
 
     fprintf( out, "    static const TQClassInfo classinfo_tbl[] = {\n" );
     int i = 0;
@@ -2872,8 +5659,7 @@ void generateClass()		      // generate C++ source code for a class
 {
     const char *hdr1 = "/****************************************************************************\n"
 		 "** %s meta object code from reading C++ file '%s'\n**\n";
-    const char *hdr2 = "** Created: %s\n"
-		 "**      by: The TQt MOC ($Id: qt/moc_yacc.cpp   3.3.8   edited Feb 2 14:59 $)\n**\n";
+    const char *hdr2 = "** Created: %s\n";
     const char *hdr3 = "** WARNING! All changes made in this file will be lost!\n";
     const char *hdr4 = "*****************************************************************************/\n\n";
     int   i;
@@ -2881,22 +5667,22 @@ void generateClass()		      // generate C++ source code for a class
     if ( skipClass )				// don't generate for class
 	return;
 
-    if ( !Q_OBJECTdetected ) {
+    if ( !TQ_OBJECTdetected ) {
 	if ( g->signals.count() == 0 && g->slots.count() == 0 && g->props.count() == 0 && g->infos.count() == 0 )
 	    return;
 	if ( displayWarnings && (g->signals.count() + g->slots.count()) != 0 )
 	    moc_err("The declaration of the class \"%s\" contains signals "
-		    "or slots\n\t but no Q_OBJECT macro.", g->className.data());
+		    "or slots\n\t but no TQ_OBJECT macro.", g->className.data());
     } else {
 	if ( g->superClassName.isEmpty() )
 	    moc_err("The declaration of the class \"%s\" contains the\n"
-		    "\tQ_OBJECT macro but does not inherit from any class!\n"
+		    "\tTQ_OBJECT macro but does not inherit from any class!\n"
 		    "\tInherit from TQObject or one of its descendants"
-		    " or remove Q_OBJECT.", g->className.data() );
+		    " or remove TQ_OBJECT.", g->className.data() );
     }
     if ( templateClass ) {			// don't generate for class
 	moc_err( "Sorry, TQt does not support templates that contain\n"
-		 "\tsignals, slots or Q_OBJECT." );
+		 "\tsignals, slots or TQ_OBJECT." );
 	return;
     }
     g->generatedCode = TRUE;
@@ -2953,7 +5739,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "#error \"This file was generated using the moc from %s."
 		 " It\"\n#error \"cannot be used with the include files from"
 		 " this version of TQt.\"\n#error \"(The moc has changed too"
-		 " much.)\"\n", QT_VERSION_STR );
+		 " much.)\"\n", TQT_VERSION_STR );
 	fprintf( out, "#endif\n\n" );
     } else {
 	fprintf( out, "\n\n" );
@@ -3154,7 +5940,7 @@ void generateClass()		      // generate C++ source code for a class
 	}
 
 	if ( !predef_call_func && !included_list_headers ) {
-	    // yes we need it, because otherwise QT_VERSION may not be defined
+	    // yes we need it, because otherwise TQT_VERSION may not be defined
 	    fprintf( out, "\n#include <%sntqobjectdefs.h>\n", (const char*)g->qtPath );
 	    fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath );
 	    included_list_headers = TRUE;
@@ -3645,1170 +6431,4 @@ void checkPropertyName( const char* ident )
 	return;
     }
 }
-#line 3649 "y.tab.c"
-#define YYABORT goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-int
-yyparse()
-{
-    register int yym, yyn, yystate;
-#if YYDEBUG
-    register char *yys;
-    extern char *getenv();
-
-    if (yys = getenv("YYDEBUG"))
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
 
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
-
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
-
-yyloop:
-    if (yyn = yydefred[yystate]) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yyss + yystacksize - 1)
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-#ifdef lint
-    goto yynewerror;
-#endif
-yynewerror:
-    yyerror("syntax error");
-#ifdef lint
-    goto yyerrlab;
-#endif
-yyerrlab:
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yyss + yystacksize - 1)
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = (-1);
-        goto yyloop;
-    }
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-    switch (yyn)
-    {
-case 10:
-#line 821 "moc.y"
-{ enterNameSpace(yyvsp[0].string); }
-break;
-case 11:
-#line 822 "moc.y"
-{ BEGIN IN_NAMESPACE; }
-break;
-case 12:
-#line 824 "moc.y"
-{ leaveNameSpace();
-					       selectOutsideClassState();
-					     }
-break;
-case 13:
-#line 829 "moc.y"
-{ enterNameSpace(); }
-break;
-case 14:
-#line 830 "moc.y"
-{ BEGIN IN_NAMESPACE; }
-break;
-case 15:
-#line 832 "moc.y"
-{ leaveNameSpace();
-					       selectOutsideClassState();
-					     }
-break;
-case 17:
-#line 841 "moc.y"
-{ selectOutsideClassState(); }
-break;
-case 18:
-#line 845 "moc.y"
-{ selectOutsideClassState(); }
-break;
-case 19:
-#line 848 "moc.y"
-{ selectOutsideClassState(); }
-break;
-case 20:
-#line 849 "moc.y"
-{ selectOutsideClassState(); }
-break;
-case 21:
-#line 852 "moc.y"
-{ initClass(); }
-break;
-case 22:
-#line 853 "moc.y"
-{ generateClass();
-						registerClassInNamespace();
-						selectOutsideClassState(); }
-break;
-case 23:
-#line 861 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 24:
-#line 862 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 25:
-#line 866 "moc.y"
-{ g->tmpExpression = rmWS( g->tmpExpression );
-				     yyval.string = stradd( yyvsp[-3].string, "<",
-						  g->tmpExpression, ">" ); }
-break;
-case 26:
-#line 877 "moc.y"
-{ initExpression();
-						    templLevel = 1;
-						    BEGIN IN_TEMPL_ARGS; }
-break;
-case 27:
-#line 890 "moc.y"
-{ initExpression();
-						    BEGIN IN_EXPR; }
-break;
-case 28:
-#line 899 "moc.y"
-{ BEGIN IN_DEF_ARG; }
-break;
-case 29:
-#line 902 "moc.y"
-{ initExpression();
-						    BEGIN IN_ENUM; }
-break;
-case 30:
-#line 908 "moc.y"
-{ yyval.string = ""; }
-break;
-case 31:
-#line 909 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 32:
-#line 910 "moc.y"
-{ yyval.string = ""; }
-break;
-case 33:
-#line 911 "moc.y"
-{ skipFunc = TRUE; yyval.string = ""; }
-break;
-case 34:
-#line 912 "moc.y"
-{ skipFunc = TRUE; yyval.string = ""; }
-break;
-case 35:
-#line 916 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-2].string,yyvsp[-1].string,yyvsp[0].string); }
-break;
-case 36:
-#line 918 "moc.y"
-{ yyval.string = ""; }
-break;
-case 37:
-#line 919 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 38:
-#line 922 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 39:
-#line 923 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-1].string,yyvsp[0].string); }
-break;
-case 42:
-#line 928 "moc.y"
-{ skipFunc = TRUE; }
-break;
-case 44:
-#line 932 "moc.y"
-{ }
-break;
-case 45:
-#line 933 "moc.y"
-{ }
-break;
-case 46:
-#line 936 "moc.y"
-{ yyval.string = "const"; }
-break;
-case 47:
-#line 937 "moc.y"
-{ yyval.string = "volatile"; }
-break;
-case 48:
-#line 940 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 49:
-#line 941 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 50:
-#line 942 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 51:
-#line 946 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-1].string,yyvsp[0].string); }
-break;
-case 52:
-#line 947 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 53:
-#line 950 "moc.y"
-{ yyval.string = "char"; }
-break;
-case 54:
-#line 951 "moc.y"
-{ yyval.string = "short"; }
-break;
-case 55:
-#line 952 "moc.y"
-{ yyval.string = "int"; }
-break;
-case 56:
-#line 953 "moc.y"
-{ yyval.string = "long"; }
-break;
-case 57:
-#line 954 "moc.y"
-{ yyval.string = "signed"; }
-break;
-case 58:
-#line 955 "moc.y"
-{ yyval.string = "unsigned"; }
-break;
-case 59:
-#line 956 "moc.y"
-{ yyval.string = "float"; }
-break;
-case 60:
-#line 957 "moc.y"
-{ yyval.string = "double"; }
-break;
-case 61:
-#line 958 "moc.y"
-{ yyval.string = "void"; }
-break;
-case 62:
-#line 962 "moc.y"
-{ g->tmpExpression = rmWS( g->tmpExpression );
-				     yyval.string = stradd( "template<",
-						  g->tmpExpression, ">" ); }
-break;
-case 64:
-#line 968 "moc.y"
-{ templateClassOld = templateClass;
-						  templateClass = TRUE;
-						}
-break;
-case 65:
-#line 974 "moc.y"
-{ yyval.string = "class"; }
-break;
-case 66:
-#line 975 "moc.y"
-{ yyval.string = "struct"; }
-break;
-case 67:
-#line 978 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 68:
-#line 980 "moc.y"
-{ yyval.string = stradd( "::", yyvsp[0].string ); }
-break;
-case 69:
-#line 984 "moc.y"
-{ yyval.string = stradd( yyvsp[-2].string, "::", yyvsp[0].string );}
-break;
-case 70:
-#line 985 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 71:
-#line 989 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-1].string,yyvsp[0].string); }
-break;
-case 72:
-#line 990 "moc.y"
-{ yyval.string = stradd("enum ",yyvsp[0].string); }
-break;
-case 73:
-#line 991 "moc.y"
-{ yyval.string = stradd("union ",yyvsp[0].string); }
-break;
-case 74:
-#line 996 "moc.y"
-{ yyval.arg_list = yyvsp[-1].arg_list;}
-break;
-case 75:
-#line 997 "moc.y"
-{ yyval.arg_list = yyvsp[-2].arg_list;
-				       func_warn("Ellipsis not supported"
-						 " in signals and slots.\n"
-						 "Ellipsis argument ignored."); }
-break;
-case 76:
-#line 1003 "moc.y"
-{ yyval.arg_list = tmpArgList; }
-break;
-case 77:
-#line 1004 "moc.y"
-{ yyval.arg_list = yyvsp[0].arg_list; }
-break;
-case 78:
-#line 1007 "moc.y"
-{ yyval.arg = 0; }
-break;
-case 81:
-#line 1012 "moc.y"
-{ func_warn("Ellipsis not supported"
-						 " in signals and slots.\n"
-						 "Ellipsis argument ignored."); }
-break;
-case 82:
-#line 1020 "moc.y"
-{ yyval.arg_list = addArg(yyvsp[0].arg); }
-break;
-case 83:
-#line 1021 "moc.y"
-{ yyval.arg_list = addArg(yyvsp[0].arg); }
-break;
-case 84:
-#line 1025 "moc.y"
-{ yyval.arg = new Argument(straddSpc(yyvsp[-1].string,yyvsp[0].string),""); }
-break;
-case 85:
-#line 1027 "moc.y"
-{ expLevel = 1; }
-break;
-case 86:
-#line 1029 "moc.y"
-{ yyval.arg = new Argument(straddSpc(yyvsp[-4].string,yyvsp[-3].string),"", 0, TRUE ); }
-break;
-case 87:
-#line 1032 "moc.y"
-{ yyval.arg = new Argument(straddSpc(yyvsp[-3].string,yyvsp[-2].string),yyvsp[0].string, yyvsp[-1].string); }
-break;
-case 88:
-#line 1035 "moc.y"
-{ expLevel = 1; }
-break;
-case 89:
-#line 1037 "moc.y"
-{ yyval.arg = new Argument(straddSpc(yyvsp[-6].string,yyvsp[-5].string),yyvsp[-3].string, yyvsp[-4].string, TRUE); }
-break;
-case 90:
-#line 1041 "moc.y"
-{ yyval.string = ""; }
-break;
-case 91:
-#line 1042 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 92:
-#line 1046 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-1].string,yyvsp[0].string); }
-break;
-case 93:
-#line 1047 "moc.y"
-{ expLevel = 1; }
-break;
-case 94:
-#line 1049 "moc.y"
-{ yyval.string = stradd( "[",
-				     g->tmpExpression =
-				     g->tmpExpression.stripWhiteSpace(), "]" ); }
-break;
-case 95:
-#line 1052 "moc.y"
-{ expLevel = 1; }
-break;
-case 96:
-#line 1054 "moc.y"
-{ yyval.string = stradd( yyvsp[-4].string,"[",
-				     g->tmpExpression =
-				     g->tmpExpression.stripWhiteSpace(),"]" ); }
-break;
-case 97:
-#line 1057 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 98:
-#line 1058 "moc.y"
-{ yyval.string = yyvsp[-1].string; }
-break;
-case 99:
-#line 1061 "moc.y"
-{ yyval.string = ""; }
-break;
-case 100:
-#line 1063 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-1].string,yyvsp[0].string);}
-break;
-case 101:
-#line 1064 "moc.y"
-{ expLevel = 1; }
-break;
-case 102:
-#line 1066 "moc.y"
-{ yyval.string = stradd( yyvsp[-4].string,"[",
-				     g->tmpExpression =
-				     g->tmpExpression.stripWhiteSpace(),"]" ); }
-break;
-case 103:
-#line 1069 "moc.y"
-{ yyval.string = yyvsp[-1].string; }
-break;
-case 105:
-#line 1083 "moc.y"
-{ tmpFunc->args	     = yyvsp[-6].arg_list;
-						  tmpFunc->qualifier = yyvsp[-4].string; }
-break;
-case 107:
-#line 1089 "moc.y"
-{ func_warn("Variable as signal or slot."); }
-break;
-case 108:
-#line 1090 "moc.y"
-{ expLevel=0; }
-break;
-case 109:
-#line 1092 "moc.y"
-{ skipFunc = TRUE; }
-break;
-case 110:
-#line 1093 "moc.y"
-{ expLevel=0; }
-break;
-case 111:
-#line 1095 "moc.y"
-{ skipFunc = TRUE; }
-break;
-case 112:
-#line 1099 "moc.y"
-{ expLevel = 1; }
-break;
-case 114:
-#line 1101 "moc.y"
-{ expLevel = 1; }
-break;
-case 116:
-#line 1106 "moc.y"
-{ yyval.string = ""; }
-break;
-case 117:
-#line 1107 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 118:
-#line 1110 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 119:
-#line 1111 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-1].string,yyvsp[0].string);}
-break;
-case 120:
-#line 1114 "moc.y"
-{ yyval.string = straddSpc("*",yyvsp[0].string);}
-break;
-case 121:
-#line 1115 "moc.y"
-{ yyval.string = stradd("&",yyvsp[0].string);}
-break;
-case 122:
-#line 1122 "moc.y"
-{ yyval.string = ""; }
-break;
-case 123:
-#line 1123 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 124:
-#line 1126 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 125:
-#line 1128 "moc.y"
-{ yyval.string = straddSpc(yyvsp[-1].string,yyvsp[0].string); }
-break;
-case 126:
-#line 1131 "moc.y"
-{ yyval.string = "const"; }
-break;
-case 127:
-#line 1132 "moc.y"
-{ yyval.string = "volatile"; }
-break;
-case 131:
-#line 1140 "moc.y"
-{ BEGIN IN_FCT; fctLevel = 1;}
-break;
-case 132:
-#line 1141 "moc.y"
-{ BEGIN QT_DEF; }
-break;
-case 133:
-#line 1148 "moc.y"
-{ BEGIN IN_CLASS;
-						  classPLevel = 1;
-						}
-break;
-case 134:
-#line 1152 "moc.y"
-{ BEGIN QT_DEF; }
-break;
-case 135:
-#line 1153 "moc.y"
-{ BEGIN QT_DEF;	  /* -- " -- */
-						  skipClass = TRUE; }
-break;
-case 136:
-#line 1155 "moc.y"
-{ BEGIN QT_DEF;	  /* -- " -- */
- 						  skipClass = TRUE; }
-break;
-case 137:
-#line 1157 "moc.y"
-{ BEGIN QT_DEF;	  /* -- " -- */
- 						  skipClass = TRUE; }
-break;
-case 138:
-#line 1161 "moc.y"
-{ BEGIN QT_DEF; /* catch ';' */
-						  skipClass = TRUE; }
-break;
-case 139:
-#line 1163 "moc.y"
-{ skipClass = TRUE;
-						  BEGIN GIMME_SEMICOLON; }
-break;
-case 143:
-#line 1170 "moc.y"
-{ yyval.string = ""; }
-break;
-case 145:
-#line 1176 "moc.y"
-{ g->className = yyvsp[0].string;
-						  if ( g->className == "TQObject" )
-						     Q_OBJECTdetected = TRUE;
-						}
-break;
-case 146:
-#line 1182 "moc.y"
-{ g->className = yyvsp[0].string;
-						  if ( g->className == "TQObject" )
-						     Q_OBJECTdetected = TRUE;
-						}
-break;
-case 147:
-#line 1189 "moc.y"
-{ g->superClassName = yyvsp[0].string; }
-break;
-case 148:
-#line 1194 "moc.y"
-{ templateClass = templateClassOld; }
-break;
-case 157:
-#line 1217 "moc.y"
-{ expLevel = 1; }
-break;
-case 159:
-#line 1222 "moc.y"
-{ yyval.string = 0; }
-break;
-case 160:
-#line 1223 "moc.y"
-{ yyval.string = yyvsp[0].string; }
-break;
-case 165:
-#line 1235 "moc.y"
-{ tmpAccess = yyvsp[0].access; }
-break;
-case 166:
-#line 1236 "moc.y"
-{ moc_err( "Missing access specifier"
-						   " before \"slots:\"." ); }
-break;
-case 167:
-#line 1240 "moc.y"
-{ BEGIN QT_DEF; }
-break;
-case 169:
-#line 1242 "moc.y"
-{ BEGIN QT_DEF; }
-break;
-case 171:
-#line 1244 "moc.y"
-{
-			      if ( tmpAccess )
-				  moc_warn("Q_OBJECT is not in the private"
-					   " section of the class.\n"
-					   "Q_OBJECT is a macro that resets"
-					   " access permission to \"private\".");
-			      Q_OBJECTdetected = TRUE;
-			  }
-break;
-case 172:
-#line 1252 "moc.y"
-{ tmpYYStart = YY_START;
-				       tmpPropOverride = FALSE;
-				       BEGIN IN_PROPERTY; }
-break;
-case 173:
-#line 1255 "moc.y"
-{
-						BEGIN tmpYYStart;
-					   }
-break;
-case 175:
-#line 1259 "moc.y"
-{ tmpYYStart = YY_START;
-				       tmpPropOverride = TRUE;
-				       BEGIN IN_PROPERTY; }
-break;
-case 176:
-#line 1262 "moc.y"
-{
-						BEGIN tmpYYStart;
-					   }
-break;
-case 178:
-#line 1266 "moc.y"
-{ tmpYYStart = YY_START; BEGIN IN_CLASSINFO; }
-break;
-case 179:
-#line 1268 "moc.y"
-{
-				      g->infos.append( new ClassInfo( yyvsp[-3].string, yyvsp[-1].string ) );
-				      BEGIN tmpYYStart;
-				  }
-break;
-case 181:
-#line 1273 "moc.y"
-{ tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
-break;
-case 182:
-#line 1274 "moc.y"
-{
-						Q_PROPERTYdetected = TRUE;
-						BEGIN tmpYYStart;
-					   }
-break;
-case 184:
-#line 1279 "moc.y"
-{ tmpYYStart = YY_START; BEGIN IN_PROPERTY; }
-break;
-case 185:
-#line 1280 "moc.y"
-{
-						Q_PROPERTYdetected = TRUE;
-						BEGIN tmpYYStart;
-					   }
-break;
-case 187:
-#line 1287 "moc.y"
-{ moc_err( "Signals cannot "
-						 "have access specifiers" ); }
-break;
-case 189:
-#line 1290 "moc.y"
-{ if ( tmpAccess == Public && Q_PROPERTYdetected )
-						  BEGIN QT_DEF;
-					      else
-						  BEGIN IN_CLASS;
-					  suppress_func_warn = TRUE;
-					}
-break;
-case 190:
-#line 1297 "moc.y"
-{
-					  suppress_func_warn = FALSE;
-					}
-break;
-case 191:
-#line 1300 "moc.y"
-{ BEGIN IN_CLASS;
-					   if ( classPLevel != 1 )
-					       moc_warn( "unexpected access"
-							 "specifier" );
-					}
-break;
-case 196:
-#line 1315 "moc.y"
-{ addMember( PropertyCandidateMember ); }
-break;
-case 201:
-#line 1327 "moc.y"
-{ addMember( SignalMember ); }
-break;
-case 206:
-#line 1338 "moc.y"
-{ addMember( SlotMember ); }
-break;
-case 209:
-#line 1345 "moc.y"
-{ yyval.string=yyvsp[0].string; }
-break;
-case 210:
-#line 1348 "moc.y"
-{ g->multipleSuperClasses.append( yyvsp[0].string ); }
-break;
-case 212:
-#line 1353 "moc.y"
-{ yyval.string = stradd( yyvsp[-3].string, "(", yyvsp[-1].string, ")" ); }
-break;
-case 213:
-#line 1355 "moc.y"
-{ yyval.string = stradd( yyvsp[-3].string, "(", yyvsp[-1].string, ")" ); }
-break;
-case 214:
-#line 1358 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 215:
-#line 1359 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 216:
-#line 1360 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 217:
-#line 1361 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 218:
-#line 1362 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 219:
-#line 1363 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 220:
-#line 1364 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 221:
-#line 1365 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 222:
-#line 1366 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 223:
-#line 1367 "moc.y"
-{yyval.string=yyvsp[0].string;}
-break;
-case 224:
-#line 1370 "moc.y"
-{ yyval.access=Private; }
-break;
-case 225:
-#line 1371 "moc.y"
-{ yyval.access=Protected; }
-break;
-case 226:
-#line 1372 "moc.y"
-{ yyval.access=Public; }
-break;
-case 227:
-#line 1375 "moc.y"
-{ }
-break;
-case 228:
-#line 1376 "moc.y"
-{ }
-break;
-case 270:
-#line 1424 "moc.y"
-{ tmpFunc->type = yyvsp[-1].string;
-						  tmpFunc->name = yyvsp[0].string; }
-break;
-case 271:
-#line 1427 "moc.y"
-{ tmpFunc->type = "int";
-						  tmpFunc->name = yyvsp[0].string;
-				  if ( tmpFunc->name == g->className )
-				      func_warn( "Constructors cannot be"
-						 " signals or slots.");
-						}
-break;
-case 272:
-#line 1434 "moc.y"
-{ tmpFunc->type = "void";
-						  tmpFunc->name = "~";
-						  tmpFunc->name += yyvsp[0].string;
-				       func_warn( "Destructors cannot be"
-						  " signals or slots.");
-						}
-break;
-case 273:
-#line 1442 "moc.y"
-{
-						    char *tmp =
-							straddSpc(yyvsp[-4].string,yyvsp[-3].string,yyvsp[-2].string,yyvsp[-1].string);
-						    tmpFunc->type = rmWS(tmp);
-						    delete [] tmp;
-						    tmpFunc->name = yyvsp[0].string; }
-break;
-case 274:
-#line 1449 "moc.y"
-{ skipFunc = TRUE; }
-break;
-case 275:
-#line 1451 "moc.y"
-{ tmpFunc->type =
-						      straddSpc(yyvsp[-2].string,yyvsp[-1].string);
-						  tmpFunc->name = yyvsp[0].string; }
-break;
-case 276:
-#line 1456 "moc.y"
-{ tmpFunc->type =
-						      straddSpc(yyvsp[-3].string,yyvsp[-2].string,yyvsp[-1].string);
-						  tmpFunc->name = yyvsp[0].string; }
-break;
-case 277:
-#line 1460 "moc.y"
-{ operatorError();    }
-break;
-case 278:
-#line 1462 "moc.y"
-{ operatorError();    }
-break;
-case 279:
-#line 1465 "moc.y"
-{ operatorError();    }
-break;
-case 280:
-#line 1467 "moc.y"
-{ operatorError();    }
-break;
-case 281:
-#line 1470 "moc.y"
-{ operatorError();    }
-break;
-case 283:
-#line 1476 "moc.y"
-{ func_warn("Unexpected variable declaration."); }
-break;
-case 284:
-#line 1479 "moc.y"
-{ func_warn("Unexpected variable declaration."); }
-break;
-case 285:
-#line 1481 "moc.y"
-{ func_warn("Unexpected enum declaration."); }
-break;
-case 286:
-#line 1483 "moc.y"
-{ func_warn("Unexpected using declaration."); }
-break;
-case 287:
-#line 1485 "moc.y"
-{ func_warn("Unexpected using declaration."); }
-break;
-case 288:
-#line 1487 "moc.y"
-{ classPLevel++;
-				  moc_err("Unexpected namespace declaration."); }
-break;
-case 289:
-#line 1490 "moc.y"
-{ func_warn("Unexpected class declaration.");}
-break;
-case 290:
-#line 1492 "moc.y"
-{ func_warn("Unexpected class declaration.");
-				  BEGIN IN_FCT; fctLevel=1;
-				}
-break;
-case 291:
-#line 1495 "moc.y"
-{ BEGIN QT_DEF; }
-break;
-case 295:
-#line 1504 "moc.y"
-{ }
-break;
-case 296:
-#line 1505 "moc.y"
-{ expLevel = 0; }
-break;
-case 298:
-#line 1507 "moc.y"
-{ expLevel = 0; }
-break;
-case 301:
-#line 1512 "moc.y"
-{ expLevel = 0; }
-break;
-case 306:
-#line 1527 "moc.y"
-{ BEGIN QT_DEF;
-				  if ( tmpAccess == Public) {
-				      tmpEnum->name = yyvsp[-4].string;
-				      addEnum();
-				  }
-				}
-break;
-case 307:
-#line 1534 "moc.y"
-{ tmpEnum->clear();}
-break;
-case 309:
-#line 1538 "moc.y"
-{ }
-break;
-case 313:
-#line 1546 "moc.y"
-{ if ( tmpAccess == Public) tmpEnum->append( yyvsp[0].string ); }
-break;
-case 314:
-#line 1547 "moc.y"
-{ enumLevel=0; }
-break;
-case 315:
-#line 1548 "moc.y"
-{  if ( tmpAccess == Public) tmpEnum->append( yyvsp[-3].string );  }
-break;
-case 316:
-#line 1552 "moc.y"
-{
-				     g->propWrite = "";
-				     g->propRead = "";
-				     g->propOverride = tmpPropOverride;
-				     g->propReset = "";
-				     if ( g->propOverride ) {
-					 g->propStored = "";
-					 g->propDesignable = "";
-					 g->propScriptable = "";
-				     } else {
-					 g->propStored = "true";
-					 g->propDesignable = "true";
-					 g->propScriptable = "true";
-				     }
-				}
-break;
-case 317:
-#line 1568 "moc.y"
-{
-				    if ( g->propRead.isEmpty() && !g->propOverride )
-					moc_err( "A property must at least feature a read method." );
-				    checkPropertyName( yyvsp[-2].string );
-				    Q_PROPERTYdetected = TRUE;
-				    /* Avoid duplicates*/
-				    for( TQPtrListIterator lit( g->props ); lit.current(); ++lit ) {
-					if ( lit.current()->name == yyvsp[-2].string ) {
-					    if ( displayWarnings )
-						moc_err( "Property '%s' defined twice.",
-							 (const char*)lit.current()->name );
-					}
-				    }
-				    g->props.append( new Property( lineNo, yyvsp[-3].string, yyvsp[-2].string,
-								g->propWrite, g->propRead, g->propReset,
-								   g->propStored, g->propDesignable,
-								   g->propScriptable, g->propOverride ) );
-				}
-break;
-case 319:
-#line 1589 "moc.y"
-{ g->propRead = yyvsp[-1].string; }
-break;
-case 320:
-#line 1590 "moc.y"
-{ g->propWrite = yyvsp[-1].string; }
-break;
-case 321:
-#line 1591 "moc.y"
-{ g->propReset = yyvsp[-1].string; }
-break;
-case 322:
-#line 1592 "moc.y"
-{ g->propStored = yyvsp[-1].string; }
-break;
-case 323:
-#line 1593 "moc.y"
-{ g->propDesignable = yyvsp[-1].string; }
-break;
-case 324:
-#line 1594 "moc.y"
-{ g->propScriptable = yyvsp[-1].string; }
-break;
-case 325:
-#line 1597 "moc.y"
-{ }
-break;
-case 326:
-#line 1598 "moc.y"
-{ g->qtEnums.append( yyvsp[-1].string ); }
-break;
-case 327:
-#line 1601 "moc.y"
-{ }
-break;
-case 328:
-#line 1602 "moc.y"
-{ g->qtSets.append( yyvsp[-1].string ); }
-break;
-#line 4759 "y.tab.c"
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
-#endif
-    if (yyssp >= yyss + yystacksize - 1)
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
-}
diff --git a/src/moc/moc_yacc.h b/src/moc/moc_yacc.h
index b4ea3123..84ef25bc 100644
--- a/src/moc/moc_yacc.h
+++ b/src/moc/moc_yacc.h
@@ -1,58 +1,166 @@
-#define CHAR_VAL 257
-#define INT_VAL 258
-#define DOUBLE_VAL 259
-#define STRING 260
-#define IDENTIFIER 261
-#define FRIEND 262
-#define TYPEDEF 263
-#define AUTO 264
-#define REGISTER 265
-#define STATIC 266
-#define EXTERN 267
-#define INLINE 268
-#define VIRTUAL 269
-#define CONST 270
-#define VOLATILE 271
-#define CHAR 272
-#define SHORT 273
-#define INT 274
-#define LONG 275
-#define SIGNED 276
-#define UNSIGNED 277
-#define FLOAT 278
-#define DOUBLE 279
-#define VOID 280
-#define ENUM 281
-#define CLASS 282
-#define STRUCT 283
-#define UNION 284
-#define ASM 285
-#define PRIVATE 286
-#define PROTECTED 287
-#define PUBLIC 288
-#define OPERATOR 289
-#define DBL_COLON 290
-#define TRIPLE_DOT 291
-#define TEMPLATE 292
-#define NAMESPACE 293
-#define USING 294
-#define MUTABLE 295
-#define THROW 296
-#define SIGNALS 297
-#define SLOTS 298
-#define Q_OBJECT 299
-#define Q_PROPERTY 300
-#define Q_OVERRIDE 301
-#define Q_CLASSINFO 302
-#define Q_ENUMS 303
-#define Q_SETS 304
-#define READ 305
-#define WRITE 306
-#define STORED 307
-#define DESIGNABLE 308
-#define SCRIPTABLE 309
-#define RESET 310
-typedef union {
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see .  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+   
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     CHAR_VAL = 258,
+     INT_VAL = 259,
+     DOUBLE_VAL = 260,
+     STRING = 261,
+     IDENTIFIER = 262,
+     FRIEND = 263,
+     TYPEDEF = 264,
+     AUTO = 265,
+     REGISTER = 266,
+     STATIC = 267,
+     EXTERN = 268,
+     INLINE = 269,
+     VIRTUAL = 270,
+     CONST = 271,
+     VOLATILE = 272,
+     CHAR = 273,
+     SHORT = 274,
+     INT = 275,
+     LONG = 276,
+     SIGNED = 277,
+     UNSIGNED = 278,
+     FLOAT = 279,
+     DOUBLE = 280,
+     VOID = 281,
+     ENUM = 282,
+     CLASS = 283,
+     STRUCT = 284,
+     UNION = 285,
+     ASM = 286,
+     PRIVATE = 287,
+     PROTECTED = 288,
+     PUBLIC = 289,
+     OPERATOR = 290,
+     DBL_COLON = 291,
+     TRIPLE_DOT = 292,
+     TEMPLATE = 293,
+     NAMESPACE = 294,
+     USING = 295,
+     MUTABLE = 296,
+     THROW = 297,
+     SIGNALS = 298,
+     SLOTS = 299,
+     TQ_OBJECT = 300,
+     Q_PROPERTY = 301,
+     Q_OVERRIDE = 302,
+     Q_CLASSINFO = 303,
+     Q_ENUMS = 304,
+     Q_SETS = 305,
+     READ = 306,
+     WRITE = 307,
+     STORED = 308,
+     DESIGNABLE = 309,
+     SCRIPTABLE = 310,
+     RESET = 311
+   };
+#endif
+/* Tokens.  */
+#define CHAR_VAL 258
+#define INT_VAL 259
+#define DOUBLE_VAL 260
+#define STRING 261
+#define IDENTIFIER 262
+#define FRIEND 263
+#define TYPEDEF 264
+#define AUTO 265
+#define REGISTER 266
+#define STATIC 267
+#define EXTERN 268
+#define INLINE 269
+#define VIRTUAL 270
+#define CONST 271
+#define VOLATILE 272
+#define CHAR 273
+#define SHORT 274
+#define INT 275
+#define LONG 276
+#define SIGNED 277
+#define UNSIGNED 278
+#define FLOAT 279
+#define DOUBLE 280
+#define VOID 281
+#define ENUM 282
+#define CLASS 283
+#define STRUCT 284
+#define UNION 285
+#define ASM 286
+#define PRIVATE 287
+#define PROTECTED 288
+#define PUBLIC 289
+#define OPERATOR 290
+#define DBL_COLON 291
+#define TRIPLE_DOT 292
+#define TEMPLATE 293
+#define NAMESPACE 294
+#define USING 295
+#define MUTABLE 296
+#define THROW 297
+#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 READ 306
+#define WRITE 307
+#define STORED 308
+#define DESIGNABLE 309
+#define SCRIPTABLE 310
+#define RESET 311
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+{
+
+/* Line 1676 of yacc.c  */
+#line 692 "moc.y"
+
     char	char_val;
     int		int_val;
     double	double_val;
@@ -61,5 +169,17 @@ typedef union {
     Function   *function;
     ArgList    *arg_list;
     Argument   *arg;
+
+
+
+/* Line 1676 of yacc.c  */
+#line 177 "moc_yacc.h"
 } YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
 extern YYSTYPE yylval;
+
+
diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h
index 96f09d26..fdf255a7 100644
--- a/src/network/ntqdns.h
+++ b/src/network/ntqdns.h
@@ -48,7 +48,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_DNS
 #else
 #define TQM_EXPORT_DNS Q_EXPORT
@@ -61,7 +61,7 @@
 class TQDnsPrivate;
 
 class TQM_EXPORT_DNS TQDns: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum RecordType {
 	None,
@@ -153,7 +153,7 @@ private:
 // TQDnsSocket are sockets that are used for DNS lookup
 
 class TQDnsSocket: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
     // note: Private not public.  This class contains NO public API.
 protected:
     TQDnsSocket( TQObject *, const char * );
diff --git a/src/network/ntqftp.h b/src/network/ntqftp.h
index 86ba6582..af4036fb 100644
--- a/src/network/ntqftp.h
+++ b/src/network/ntqftp.h
@@ -47,7 +47,7 @@
 #include "ntqnetworkprotocol.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_FTP
 #else
 #define TQM_EXPORT_FTP Q_EXPORT
@@ -61,7 +61,7 @@ class TQFtpCommand;
 
 class TQM_EXPORT_FTP TQFtp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFtp(); // ### TQt 4.0: get rid of this overload
diff --git a/src/network/ntqhostaddress.h b/src/network/ntqhostaddress.h
index 17de1628..2ae4a8ea 100644
--- a/src/network/ntqhostaddress.h
+++ b/src/network/ntqhostaddress.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h
index f0f9d2ea..27849350 100644
--- a/src/network/ntqhttp.h
+++ b/src/network/ntqhttp.h
@@ -47,7 +47,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_HTTP
 #define TQM_TEMPLATE_EXTERN_HTTP
 #else
@@ -168,7 +168,7 @@ private:
 
 class TQM_EXPORT_HTTP TQHttp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQHttp();
diff --git a/src/network/ntqnetwork.h b/src/network/ntqnetwork.h
index 0565ea51..2431b9ef 100644
--- a/src/network/ntqnetwork.h
+++ b/src/network/ntqnetwork.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
diff --git a/src/network/ntqserversocket.h b/src/network/ntqserversocket.h
index b5c2a4b8..7d151030 100644
--- a/src/network/ntqserversocket.h
+++ b/src/network/ntqserversocket.h
@@ -48,7 +48,7 @@
 #endif // QT_H
 #ifndef QT_NO_NETWORK
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -59,7 +59,7 @@ class TQServerSocketPrivate;
 
 class TQM_EXPORT_NETWORK TQServerSocket : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQServerSocket( Q_UINT16 port, int backlog = 1,
 		   TQObject *parent=0, const char *name=0 );
diff --git a/src/network/ntqsocket.h b/src/network/ntqsocket.h
index 2a727dd3..545647ee 100644
--- a/src/network/ntqsocket.h
+++ b/src/network/ntqsocket.h
@@ -47,7 +47,7 @@
 #include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -60,7 +60,7 @@ class TQSocketDevice;
 
 class TQM_EXPORT_NETWORK TQSocket : public TQObject, public TQIODevice
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Error {
 	ErrConnectionRefused,
@@ -146,7 +146,7 @@ private:
     void         setSocketIntern( int socket );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocket( const TQSocket & );
     TQSocket &operator=( const TQSocket & );
 #endif
diff --git a/src/network/ntqsocketdevice.h b/src/network/ntqsocketdevice.h
index bd3d6222..a8a5b83c 100644
--- a/src/network/ntqsocketdevice.h
+++ b/src/network/ntqsocketdevice.h
@@ -46,7 +46,7 @@
 #include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -160,7 +160,7 @@ private:
     Protocol	 getProtocol() const;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocketDevice( const TQSocketDevice & );
     TQSocketDevice &operator=( const TQSocketDevice & );
 #endif
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 441cdda5..ec09fde4 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -64,7 +64,7 @@ class TQFtpPI;
 
 class TQFtpDTP : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum ConnectState {
@@ -158,7 +158,7 @@ private:
 
 class TQFtpPI : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFtpPI( TQObject *parent = 0 );
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h
index 0476dfef..7388c41e 100644
--- a/src/opengl/ntqgl.h
+++ b/src/opengl/ntqgl.h
@@ -46,7 +46,7 @@
 #include "ntqglcolormap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_OPENGL
 #else
 #define TQM_EXPORT_OPENGL Q_EXPORT
@@ -274,7 +274,7 @@ private:	// Disabled copy constructor and operator=
 
 class TQM_EXPORT_OPENGL TQGLWidget : public TQWidget, public TQGL
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGLWidget( TQWidget* parent=0, const char* name=0,
 	       const TQGLWidget* shareWidget = 0, WFlags f=0 );
@@ -367,7 +367,7 @@ private:
 #endif
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGLWidget( const TQGLWidget& );
     TQGLWidget& operator=( const TQGLWidget& );
 #endif
diff --git a/src/opengl/ntqglcolormap.h b/src/opengl/ntqglcolormap.h
index 23e33410..8fb24921 100644
--- a/src/opengl/ntqglcolormap.h
+++ b/src/opengl/ntqglcolormap.h
@@ -47,7 +47,7 @@
 #include "ntqshared.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_OPENGL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_OPENGL
 #else
 #define TQM_EXPORT_OPENGL Q_EXPORT
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 612448d5..95cbae5d 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1165,7 +1165,7 @@ bool TQGLContext::create( const TQGLContext* shareContext )
     \code
     class MyGLDrawer : public TQGLWidget
     {
-	Q_OBJECT	// must include this if you use TQt signals/slots
+	TQ_OBJECT	// must include this if you use TQt signals/slots
 
     public:
 	MyGLDrawer( TQWidget *parent, const char *name )
@@ -2220,7 +2220,7 @@ void TQGLWidget::renderText( int x, int y, const TQString & str, const TQFont &
     glBitmap(0, 0, 0, 0, x, -y, NULL);
     glListBase( displayListBase( fnt, listBase ) );
     const char *cstr = str.latin1();
-    glCallLists( qstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
+    glCallLists( tqstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
 
     // restore the matrix stacks and GL state
     glPopMatrix();
@@ -2246,7 +2246,7 @@ void TQGLWidget::renderText( double x, double y, double z, const TQString & str,
     glPushAttrib( GL_LIST_BIT );
     glListBase( displayListBase( fnt, listBase ) );
     const char *cstr = str.latin1();
-    glCallLists( qstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
+    glCallLists( tqstrlen(cstr), GL_UNSIGNED_BYTE, cstr );
     glPopAttrib();
 }
 
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index a8f317a4..caa76398 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -974,7 +974,7 @@ void TQGLContext::generateFontDisplayLists( const TQFont & fnt, int listBase )
 
 class TQGLOverlayWidget : public TQGLWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGLOverlayWidget( const TQGLFormat& format, TQGLWidget* parent,
 		      const char* name=0, const TQGLWidget* shareWidget=0 );
@@ -988,7 +988,7 @@ private:
     TQGLWidget*		realWidget;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGLOverlayWidget( const TQGLOverlayWidget& );
     TQGLOverlayWidget&	operator=( const TQGLOverlayWidget& );
 #endif
diff --git a/src/qt_professional.pri b/src/qt_professional.pri
index 93b7136e..6320b9c5 100644
--- a/src/qt_professional.pri
+++ b/src/qt_professional.pri
@@ -12,7 +12,7 @@
 	}
 	INCLUDEPATH += $$QT_SOURCE_TREE/src/xml
 	include( $$QT_SOURCE_TREE/src/xml/qt_xml.pri )
-	DEFINES     *= QT_MODULE_XML 
+	DEFINES     *= TQT_MODULE_XML 
 }
 
 !network:contains( DEFINES, QT_INTERNAL_NETWORK) {
@@ -28,7 +28,7 @@
 	mac:INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/dlcompat
 	INCLUDEPATH += $$QT_SOURCE_TREE/src/network
 	include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
-	DEFINES     *= QT_MODULE_NETWORK
+	DEFINES     *= TQT_MODULE_NETWORK
 }
 
 !workspace:contains( DEFINES, QT_INTERNAL_WORKSPACE ) {
@@ -43,7 +43,7 @@
 	}
 	INCLUDEPATH += $$QT_SOURCE_TREE/src/workspace
 	include( $$QT_SOURCE_TREE/src/workspace/qt_workspace.pri )
-	DEFINES     *= QT_MODULE_WORKSPACE
+	DEFINES     *= TQT_MODULE_WORKSPACE
 }
 
 !iconview:contains( DEFINES, QT_INTERNAL_ICONVIEW ) {
@@ -58,7 +58,7 @@
 	}
 	INCLUDEPATH += $$QT_SOURCE_TREE/src/iconview
 	include( $$QT_SOURCE_TREE/src/iconview/qt_iconview.pri )
-	DEFINES     *= QT_MODULE_ICONVIEW
+	DEFINES     *= TQT_MODULE_ICONVIEW
 }
 
 !canvas:contains( DEFINES, QT_INTERNAL_CANVAS ) {
@@ -73,7 +73,7 @@
 	}
 	INCLUDEPATH += $$QT_SOURCE_TREE/src/canvas
 	include( $$QT_SOURCE_TREE/src/canvas/qt_canvas.pri )
-	DEFINES     *= QT_MODULE_CANVAS
+	DEFINES     *= TQT_MODULE_CANVAS
 }
 
 !table:contains( DEFINES, QT_INTERNAL_TABLE ) {
@@ -88,7 +88,7 @@
 	}
 	INCLUDEPATH += $$QT_SOURCE_TREE/src/table
 	include( $$QT_SOURCE_TREE/src/table/qt_table.pri )
-	DEFINES     *= QT_MODULE_TABLE
+	DEFINES     *= TQT_MODULE_TABLE
 }
 
 contains(QT_PRODUCT,qt-professional) {
diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h
index bde3457d..b00779dc 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.h
+++ b/src/sql/drivers/cache/qsqlcachedresult.h
@@ -57,7 +57,7 @@
 #include 
 #include 
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 433e8de2..d34e5850 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -305,7 +305,7 @@ bool TQMYSQLResult::reset ( const TQString& query )
     cleanup();
 
     const char *encQuery = query.ascii();
-    if ( mysql_real_query( d->mysql, encQuery, qstrlen(encQuery) ) ) {
+    if ( mysql_real_query( d->mysql, encQuery, tqstrlen(encQuery) ) ) {
 	setLastError( qMakeError("Unable to execute query", TQSqlError::Statement, d ) );
 	return FALSE;
     }
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index b91bea32..2a387f51 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -428,7 +428,7 @@ static double qGetDoubleData( SQLHANDLE hStmt, int column, bool& isNull )
 
 static SQLBIGINT qGetBigIntData( SQLHANDLE hStmt, int column, bool& isNull )
 {
-    SQLBIGINT lngbuf = Q_INT64_C( 0 );
+    SQLBIGINT lngbuf = TQ_INT64_C( 0 );
     isNull = FALSE;
     TQSQLLEN lengthIndicator = 0;
     SQLRETURN r = SQLGetData( hStmt,
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 1662a6e8..35033667 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -18,7 +18,7 @@
 #include 
 #include 
 
-#if (QT_VERSION-0 < 0x030000)
+#if (TQT_VERSION-0 < 0x030000)
 #  include 
 #  if !defined Q_WS_WIN32
 #    include 
@@ -303,7 +303,7 @@ bool TQSQLiteDriver::hasFeature(DriverFeature f) const
     switch (f) {
     case Transactions:
         return TRUE;
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
     case Unicode:
         return d->utf8;
 #endif
@@ -414,7 +414,7 @@ TQStringList TQSQLiteDriver::tables(const TQString &typeName) const
 
     TQSqlQuery q = createQuery();
     q.setForwardOnly(TRUE);
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
     if ((type & (int)TQSql::Tables) && (type & (int)TQSql::Views))
         q.exec("SELECT name FROM sqlite_master WHERE type='table' OR type='view'");
     else if (typeName.isEmpty() || (type & (int)TQSql::Tables))
@@ -431,7 +431,7 @@ TQStringList TQSQLiteDriver::tables(const TQString &typeName) const
             res.append(q.value(0).toString());
     }
 
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
     if (type & (int)TQSql::SystemTables) {
         // there are no internal tables beside this one:
         res.append("sqlite_master");
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h
index 300642ce..ff05ede6 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.h
+++ b/src/sql/drivers/sqlite/qsql_sqlite.h
@@ -21,7 +21,7 @@
 #include 
 #include "../cache/qsqlcachedresult.h"
 
-#if (QT_VERSION-0 >= 0x030000)
+#if (TQT_VERSION-0 >= 0x030000)
 typedef TQVariant TQSqlVariant;
 #endif
 
diff --git a/src/sql/ntqdatabrowser.h b/src/sql/ntqdatabrowser.h
index 9fa57a89..938b9320 100644
--- a/src/sql/ntqdatabrowser.h
+++ b/src/sql/ntqdatabrowser.h
@@ -58,7 +58,7 @@ class TQDataBrowserPrivate;
 
 class Q_EXPORT TQDataBrowser : public TQWidget
 {
-    Q_OBJECT
+    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 )
@@ -166,7 +166,7 @@ private:
     void nav( Nav nav );
     TQDataBrowserPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataBrowser( const TQDataBrowser & );
     TQDataBrowser &operator=( const TQDataBrowser & );
 #endif
diff --git a/src/sql/ntqdatatable.h b/src/sql/ntqdatatable.h
index 11b9c60b..e92f8b6c 100644
--- a/src/sql/ntqdatatable.h
+++ b/src/sql/ntqdatatable.h
@@ -52,7 +52,7 @@
 #include "ntqiconset.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -67,7 +67,7 @@ class TQDataTablePrivate;
 
 class TQM_EXPORT_SQL TQDataTable : public TQTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( TQString nullText READ nullText WRITE setNullText )
     Q_PROPERTY( TQString trueText READ trueText WRITE setTrueText )
@@ -234,7 +234,7 @@ private:
     void         endUpdate();
     TQDataTablePrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataTable( const TQDataTable & );
     TQDataTable &operator=( const TQDataTable & );
 #endif
diff --git a/src/sql/ntqdataview.h b/src/sql/ntqdataview.h
index 244c8039..ca1fed1b 100644
--- a/src/sql/ntqdataview.h
+++ b/src/sql/ntqdataview.h
@@ -45,7 +45,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -59,7 +59,7 @@ class TQDataViewPrivate;
 
 class TQM_EXPORT_SQL TQDataView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDataView( TQWidget* parent=0, const char* name=0, WFlags fl = 0 );
@@ -79,7 +79,7 @@ public slots:
 private:
     TQDataViewPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDataView( const TQDataView & );
     TQDataView &operator=( const TQDataView & );
 #endif
diff --git a/src/sql/ntqeditorfactory.h b/src/sql/ntqeditorfactory.h
index 9ec8485c..8818770c 100644
--- a/src/sql/ntqeditorfactory.h
+++ b/src/sql/ntqeditorfactory.h
@@ -46,7 +46,7 @@
 #include "ntqvariant.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -66,7 +66,7 @@ public:
     static void installDefaultFactory( TQEditorFactory * factory);
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQEditorFactory( const TQEditorFactory & );
     TQEditorFactory &operator=( const TQEditorFactory & );
 #endif
diff --git a/src/sql/ntqsql.h b/src/sql/ntqsql.h
index 68aa971f..78030f79 100644
--- a/src/sql/ntqsql.h
+++ b/src/sql/ntqsql.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -89,7 +89,7 @@ public:
     };
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSql( const TQSql & );
     TQSql &operator=( const TQSql & );
 #endif
diff --git a/src/sql/ntqsqlcursor.h b/src/sql/ntqsqlcursor.h
index 0e6e3d0b..f04f53d0 100644
--- a/src/sql/ntqsqlcursor.h
+++ b/src/sql/ntqsqlcursor.h
@@ -48,7 +48,7 @@
 #include "ntqsqlindex.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h
index 3112e2b3..97b744b1 100644
--- a/src/sql/ntqsqldatabase.h
+++ b/src/sql/ntqsqldatabase.h
@@ -48,7 +48,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -78,7 +78,7 @@ public:
 
 class TQM_EXPORT_SQL TQSqlDatabase : public TQObject
 {
-    Q_OBJECT
+    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 )
@@ -144,7 +144,7 @@ protected:
 private:
     void 	init( const TQString& type, const TQString& name );
     TQSqlDatabasePrivate* d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlDatabase( const TQSqlDatabase & );
     TQSqlDatabase &operator=( const TQSqlDatabase & );
 #endif
diff --git a/src/sql/ntqsqldriver.h b/src/sql/ntqsqldriver.h
index c1059772..5da90309 100644
--- a/src/sql/ntqsqldriver.h
+++ b/src/sql/ntqsqldriver.h
@@ -53,7 +53,7 @@
 #include "ntqmap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -68,7 +68,7 @@ class TQSqlDatabase;
 class TQM_EXPORT_SQL TQSqlDriver : public TQObject
 {
     friend class TQSqlDatabase;
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries,
 			 NamedPlaceholders, PositionalPlaceholders };
@@ -115,7 +115,7 @@ private:
     // ### This class needs a d-pointer in 4.0.
     int		          dbState;
     TQSqlError	          error;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlDriver( const TQSqlDriver & );
     TQSqlDriver &operator=( const TQSqlDriver & );
 #endif
diff --git a/src/sql/ntqsqldriverplugin.h b/src/sql/ntqsqldriverplugin.h
index e5a9352a..1b451477 100644
--- a/src/sql/ntqsqldriverplugin.h
+++ b/src/sql/ntqsqldriverplugin.h
@@ -54,7 +54,7 @@ class TQSqlDriverPluginPrivate;
 
 class Q_EXPORT TQSqlDriverPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlDriverPlugin();
     ~TQSqlDriverPlugin();
diff --git a/src/sql/ntqsqleditorfactory.h b/src/sql/ntqsqleditorfactory.h
index f04e3b35..0fb30ff2 100644
--- a/src/sql/ntqsqleditorfactory.h
+++ b/src/sql/ntqsqleditorfactory.h
@@ -45,7 +45,7 @@
 #include "ntqeditorfactory.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -67,7 +67,7 @@ public:
     static void installDefaultFactory( TQSqlEditorFactory * factory );
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlEditorFactory( const TQSqlEditorFactory & );
     TQSqlEditorFactory &operator=( const TQSqlEditorFactory & );
 #endif
diff --git a/src/sql/ntqsqlerror.h b/src/sql/ntqsqlerror.h
index 04beb09d..ca4c6cae 100644
--- a/src/sql/ntqsqlerror.h
+++ b/src/sql/ntqsqlerror.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/ntqsqlfield.h b/src/sql/ntqsqlfield.h
index 0c33bb67..bec5edd2 100644
--- a/src/sql/ntqsqlfield.h
+++ b/src/sql/ntqsqlfield.h
@@ -46,7 +46,7 @@
 #include "ntqvariant.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/ntqsqlform.h b/src/sql/ntqsqlform.h
index f5aefa76..2c050c96 100644
--- a/src/sql/ntqsqlform.h
+++ b/src/sql/ntqsqlform.h
@@ -46,7 +46,7 @@
 #include "ntqmap.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -63,7 +63,7 @@ class TQSqlFormPrivate;
 
 class TQM_EXPORT_SQL TQSqlForm : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlForm( TQObject * parent = 0, const char * name = 0 );
     ~TQSqlForm();
@@ -98,7 +98,7 @@ private:
     virtual void sync();
     TQSqlFormPrivate* d;
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQSqlForm( const TQSqlForm & );
     TQSqlForm &operator=( const TQSqlForm & );
 #endif
diff --git a/src/sql/ntqsqlindex.h b/src/sql/ntqsqlindex.h
index 59ca4220..1b88cb9d 100644
--- a/src/sql/ntqsqlindex.h
+++ b/src/sql/ntqsqlindex.h
@@ -48,7 +48,7 @@
 #include "ntqsqlrecord.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #define TQM_TEMPLATE_EXTERN_SQL
 #else
diff --git a/src/sql/ntqsqlpropertymap.h b/src/sql/ntqsqlpropertymap.h
index 57920009..93c30cb5 100644
--- a/src/sql/ntqsqlpropertymap.h
+++ b/src/sql/ntqsqlpropertymap.h
@@ -66,7 +66,7 @@ public:
     static void installDefaultMap( TQSqlPropertyMap * map );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlPropertyMap( const TQSqlPropertyMap & );
     TQSqlPropertyMap &operator=( const TQSqlPropertyMap & );
 #endif
diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h
index 502f07f4..4852e78e 100644
--- a/src/sql/ntqsqlquery.h
+++ b/src/sql/ntqsqlquery.h
@@ -59,7 +59,7 @@ class TQSqlDatabase;
 
 class Q_EXPORT TQSqlResultShared : public TQObject, public TQShared
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSqlResultShared( TQSqlResult* result );
     virtual ~TQSqlResultShared();
diff --git a/src/sql/ntqsqlresult.h b/src/sql/ntqsqlresult.h
index 0ad0d05d..410d6f0d 100644
--- a/src/sql/ntqsqlresult.h
+++ b/src/sql/ntqsqlresult.h
@@ -49,7 +49,7 @@
 #include "ntqsql.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
@@ -105,7 +105,7 @@ private:
     bool forwardOnly;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSqlResult( const TQSqlResult & );
     TQSqlResult &operator=( const TQSqlResult & );
 #endif
diff --git a/src/sql/ntqsqlselectcursor.h b/src/sql/ntqsqlselectcursor.h
index 5ad13ec4..f3065634 100644
--- a/src/sql/ntqsqlselectcursor.h
+++ b/src/sql/ntqsqlselectcursor.h
@@ -45,7 +45,7 @@
 #include "ntqsqlcursor.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/qsqldriverinterface_p.h b/src/sql/qsqldriverinterface_p.h
index bfc5dc31..0944153b 100644
--- a/src/sql/qsqldriverinterface_p.h
+++ b/src/sql/qsqldriverinterface_p.h
@@ -57,7 +57,7 @@
 #include 
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h
index 7e4237c6..e87d5e54 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -63,7 +63,7 @@
 
 #ifndef QT_NO_SQL
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #define TQM_TEMPLATE_EXTERN_SQL
 #else
diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h
index b36b4d1e..0fb20332 100644
--- a/src/sql/qsqlmanager_p.h
+++ b/src/sql/qsqlmanager_p.h
@@ -63,7 +63,7 @@
 #include "ntqsqlcursor.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
+#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
 #else
 #define TQM_EXPORT_SQL Q_EXPORT
diff --git a/src/styles/ntqcdestyle.h b/src/styles/ntqcdestyle.h
index f82236e1..5266130b 100644
--- a/src/styles/ntqcdestyle.h
+++ b/src/styles/ntqcdestyle.h
@@ -56,7 +56,7 @@
 
 class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TQCDEStyle( bool useHighlightCols = FALSE );
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h
index 57312176..6fd636fd 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQCommonStyle: public TQStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQCommonStyle();
@@ -124,7 +124,7 @@ public:
 
 private:
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCommonStyle( const TQCommonStyle & );
     TQCommonStyle &operator=( const TQCommonStyle & );
 #endif
diff --git a/src/styles/ntqcompactstyle.h b/src/styles/ntqcompactstyle.h
index 60e298a8..2ce20581 100644
--- a/src/styles/ntqcompactstyle.h
+++ b/src/styles/ntqcompactstyle.h
@@ -64,7 +64,7 @@ public:
 		      const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& = TQStyleOption::Default );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCompactStyle( const TQCompactStyle & );
     TQCompactStyle& operator=( const TQCompactStyle & );
 #endif
diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h
index 1034d085..2766320a 100644
--- a/src/styles/ntqmotifplusstyle.h
+++ b/src/styles/ntqmotifplusstyle.h
@@ -56,7 +56,7 @@
 
 class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQMotifPlusStyle(bool hoveringHighlight = TRUE);
diff --git a/src/styles/ntqmotifstyle.h b/src/styles/ntqmotifstyle.h
index 44388660..fbfbf250 100644
--- a/src/styles/ntqmotifstyle.h
+++ b/src/styles/ntqmotifstyle.h
@@ -58,7 +58,7 @@ class TQPalette;
 
 class Q_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQMotifStyle( bool useHighlightCols=FALSE );
     virtual ~TQMotifStyle();
@@ -125,7 +125,7 @@ private:
     bool highlightCols;
 
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMotifStyle( const TQMotifStyle & );
     TQMotifStyle& operator=( const TQMotifStyle & );
 #endif
diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/ntqplatinumstyle.h
index 994cf051..3b4657e3 100644
--- a/src/styles/ntqplatinumstyle.h
+++ b/src/styles/ntqplatinumstyle.h
@@ -57,7 +57,7 @@ class TQPalette;
 
 class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQPlatinumStyle();
     virtual ~TQPlatinumStyle();
@@ -106,7 +106,7 @@ protected:
     void drawRiffles( TQPainter* p,  int x, int y, int w, int h,
 		      const TQColorGroup &g, bool horizontal ) const;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPlatinumStyle( const TQPlatinumStyle & );
     TQPlatinumStyle& operator=( const TQPlatinumStyle & );
 #endif
diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h
index 16d3a8ba..b724a5b8 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -59,7 +59,7 @@ class TQSGIStylePrivate;
 
 class Q_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSGIStyle( bool useHighlightCols = FALSE );
     virtual ~TQSGIStyle();
@@ -121,7 +121,7 @@ private:
     TQSGIStylePrivate *d;
 
     uint isApplicationStyle :1;
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSGIStyle( const TQSGIStyle & );
     TQSGIStyle& operator=( const TQSGIStyle & );
 #endif
diff --git a/src/styles/ntqstyleplugin.h b/src/styles/ntqstyleplugin.h
index d527be7e..bf48d080 100644
--- a/src/styles/ntqstyleplugin.h
+++ b/src/styles/ntqstyleplugin.h
@@ -54,7 +54,7 @@ class TQStylePluginPrivate;
 
 class Q_EXPORT TQStylePlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQStylePlugin();
     ~TQStylePlugin();
diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/ntqwindowsstyle.h
index 0bfec619..5f7d4d7a 100644
--- a/src/styles/ntqwindowsstyle.h
+++ b/src/styles/ntqwindowsstyle.h
@@ -56,7 +56,7 @@
 
 class Q_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWindowsStyle();
     ~TQWindowsStyle();
@@ -124,7 +124,7 @@ private:
     Private *d;
 
     // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWindowsStyle( const TQWindowsStyle & );
     TQWindowsStyle& operator=( const TQWindowsStyle & );
 #endif
diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h
index 67f7f2a6..a5202725 100644
--- a/src/table/ntqtable.h
+++ b/src/table/ntqtable.h
@@ -57,7 +57,7 @@
 
 #ifndef QT_NO_TABLE
 
-#if !defined( QT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE )
+#if !defined( TQT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE )
 #define TQM_EXPORT_TABLE
 #ifndef TQM_TEMPLATE_EXTERN_TABLE
 #   define TQM_TEMPLATE_EXTERN_TABLE
@@ -175,7 +175,7 @@ private:
     uint enabled : 1;
     int rw, cl;
     int rowspan, colspan;
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Add a setAlignment() function in 4.0 (but no d pointer)"
 #endif
 };
@@ -246,7 +246,7 @@ private:
 
 class TQM_EXPORT_TABLE TQTable : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode FocusStyle )
     Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
     Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
@@ -552,7 +552,7 @@ private:
     FocusStyle focusStl;
     TQSize unused_cachedSizeHint; // ### remove in 4.0
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTable( const TQTable & );
     TQTable &operator=( const TQTable & );
 #endif
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 4695d09a..b9926f3f 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -80,7 +80,7 @@ void qt_set_table_clipper_enabled( bool enabled )
 class TQM_EXPORT_TABLE TQTableHeader : public TQHeader
 {
     friend class TQTable;
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum SectionState {
diff --git a/src/tools/ntqbuffer.h b/src/tools/ntqbuffer.h
index ba5aea33..7ab32039 100644
--- a/src/tools/ntqbuffer.h
+++ b/src/tools/ntqbuffer.h
@@ -83,7 +83,7 @@ private:
     uint  a_inc;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQBuffer( const TQBuffer & );
     TQBuffer &operator=( const TQBuffer & );
 #endif
diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h
index f3893f63..18837ad3 100644
--- a/src/tools/ntqcstring.h
+++ b/src/tools/ntqcstring.h
@@ -57,7 +57,7 @@ Q_EXPORT void *qmemmove( void *dst, const void *src, uint len );
 
 Q_EXPORT char *qstrdup( const char * );
 
-Q_EXPORT inline uint qstrlen( const char *str )
+Q_EXPORT inline uint tqstrlen( const char *str )
 { return str ? (uint)strlen(str) : 0u; }
 
 Q_EXPORT inline char *qstrcpy( char *dst, const char *src )
@@ -71,7 +71,7 @@ Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 )
 			    : ( str1 ? 1 : ( str2 ? -1 : 0 ) );
 }
 
-Q_EXPORT inline int qstrncmp( const char *str1, const char *str2, uint len )
+Q_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len )
 {
     return ( str1 && str2 ) ? strncmp( str1, str2, len )
 			    : ( str1 ? 1 : ( str2 ? -1 : 0 ) );
@@ -121,11 +121,11 @@ typedef TQMemArray TQByteArray;
 
 #ifndef QT_NO_COMPRESS
 Q_EXPORT TQByteArray qCompress( const uchar* data, int nbytes );
-Q_EXPORT TQByteArray qUncompress( const uchar* data, int nbytes );
+Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes );
 Q_EXPORT inline TQByteArray qCompress( const TQByteArray& data)
 { return qCompress( (const uchar*)data.data(), data.size() ); }
-Q_EXPORT inline TQByteArray qUncompress( const TQByteArray& data )
-{ return qUncompress( (const uchar*)data.data(), data.size() ); }
+Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data )
+{ return tqUncompress( (const uchar*)data.data(), data.size() ); }
 #endif
 
 /*****************************************************************************
@@ -256,7 +256,7 @@ inline TQCString &TQCString::operator=( const TQCString &s )
 { return (TQCString&)assign( s ); }
 
 inline TQCString &TQCString::operator=( const char *str )
-{ return (TQCString&)duplicate( str, qstrlen(str)+1 ); }
+{ return (TQCString&)duplicate( str, tqstrlen(str)+1 ); }
 
 inline bool TQCString::isNull() const
 { return data() == 0; }
@@ -265,7 +265,7 @@ inline bool TQCString::isEmpty() const
 { return data() == 0 || *data() == '\0'; }
 
 inline uint TQCString::length() const
-{ return qstrlen( data() ); }
+{ return tqstrlen( data() ); }
 
 inline bool TQCString::truncate( uint pos )
 { return resize(pos+1); }
diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h
index 73fa584c..1031f3bf 100644
--- a/src/tools/ntqdatastream.h
+++ b/src/tools/ntqdatastream.h
@@ -120,7 +120,7 @@ private:
     int		 ver;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDataStream( const TQDataStream & );
     TQDataStream &operator=( const TQDataStream & );
 #endif
diff --git a/src/tools/ntqfile.h b/src/tools/ntqfile.h
index 40ad4685..829ae91d 100644
--- a/src/tools/ntqfile.h
+++ b/src/tools/ntqfile.h
@@ -114,7 +114,7 @@ private:
     TQCString	ungetchBuffer;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFile( const TQFile & );
     TQFile &operator=( const TQFile & );
 #endif
diff --git a/src/tools/ntqfileinfo.h b/src/tools/ntqfileinfo.h
index 36cf4d7a..28f2aea9 100644
--- a/src/tools/ntqfileinfo.h
+++ b/src/tools/ntqfileinfo.h
@@ -119,7 +119,7 @@ public:
 
     bool	permission( int permissionSpec ) const;
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQFileInfo::size() should return TQIODevice::Offset instead of uint"
 #elif defined(QT_ABI_QT4)
     TQIODevice::Offset size()	const;
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 34d9acea..385156f0 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -43,11 +43,11 @@
 
 #define TQT_REAL_TQT 1
 
-#define QT_VERSION_STR   "3.4.0"
+#define TQT_VERSION_STR   "3.4.0"
 /*
-   QT_VERSION is (major << 16) + (minor << 8) + patch.
+   TQT_VERSION is (major << 16) + (minor << 8) + patch.
  */
-#define QT_VERSION 0x030400
+#define TQT_VERSION 0x030400
 
 /*
    The operating system, must be one of: (Q_OS_x)
@@ -321,7 +321,7 @@
    members of a packed struct. (Pointers are OK, because then you
    supposedly know what you are doing.) */
 #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(__ARM_EABI__) && !defined(QT_MOC_CPP)
-#    define Q_PACKED __attribute__ ((packed))
+#    define TQ_PACKED __attribute__ ((packed))
 #    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3
 #      define Q_NO_PACKED_REFERENCE
 #    endif
@@ -548,8 +548,8 @@
 #  error "TQt has not been tested with this compiler - talk to qt-bugs@trolltech.com"
 #endif
 
-#ifndef Q_PACKED
-#  define Q_PACKED
+#ifndef TQ_PACKED
+#  define TQ_PACKED
 #endif
 
 
@@ -607,10 +607,10 @@
    Some classes do not permit copies to be made of an object.
    These classes contains a private copy constructor and operator=
    to disable copying (the compiler gives an error message).
-   Undefine Q_DISABLE_COPY to turn off this checking.
+   Undefine TQ_DISABLE_COPY to turn off this checking.
 */
 
-#define Q_DISABLE_COPY
+#define TQ_DISABLE_COPY
 
 #if defined(__cplusplus)
 
@@ -692,7 +692,7 @@ const bool true = TRUE;
 #define TQMIN(a, b)	((a) < (b) ? (a) : (b))
 #define TQABS(a)	((a) >= 0  ? (a) : -(a))
 
-inline int qRound( double d )
+inline int tqRound( double d )
 {
     return d >= 0.0 ? int(d + 0.5) : int( d - ((int)d-1) + 0.5 ) + ((int)d-1);
 }
@@ -726,13 +726,13 @@ typedef long			Q_LONG;		// word up to 64 bit signed
 typedef unsigned long		Q_ULONG;	// word up to 64 bit unsigned
 #endif
 #if defined(Q_OS_WIN) && !defined(Q_CC_GNU)
-#  define Q_INT64_C(c) 		c ## i64	// signed 64 bit constant
-#  define Q_UINT64_C(c)		c ## ui64	// unsigned 64 bit constant
+#  define TQ_INT64_C(c) 		c ## i64	// signed 64 bit constant
+#  define TQ_UINT64_C(c)		c ## ui64	// unsigned 64 bit constant
 typedef __int64			Q_INT64;	// 64 bit signed
 typedef unsigned __int64	Q_UINT64;	// 64 bit unsigned
 #else
-#  define Q_INT64_C(c) 		c ## LL		// signed 64 bit constant
-#  define Q_UINT64_C(c)		c ## ULL	// unsigned 64 bit constant
+#  define TQ_INT64_C(c) 		c ## LL		// signed 64 bit constant
+#  define TQ_UINT64_C(c)		c ## ULL	// unsigned 64 bit constant
 typedef long long		Q_INT64;	// 64 bit signed
 typedef unsigned long long	Q_UINT64;	// 64 bit unsigned
 #endif
@@ -782,37 +782,37 @@ class TQDataStream;
 #endif
 
 
-#ifndef QT_BUILD_KEY
-#define QT_BUILD_KEY "unspecified"
+#ifndef TQT_BUILD_KEY
+#define TQT_BUILD_KEY "unspecified"
 #endif
 
 // prune to local config
 #include "ntqmodules.h"
-#ifndef QT_MODULE_DIALOGS
+#ifndef TQT_MODULE_DIALOGS
 # define QT_NO_DIALOG
 #endif
-#ifndef QT_MODULE_ICONVIEW
+#ifndef TQT_MODULE_ICONVIEW
 # define QT_NO_ICONVIEW
 #endif
-#ifndef QT_MODULE_WORKSPACE
+#ifndef TQT_MODULE_WORKSPACE
 # define QT_NO_WORKSPACE
 #endif
-#ifndef QT_MODULE_NETWORK
+#ifndef TQT_MODULE_NETWORK
 #define QT_NO_NETWORK
 #endif
-#ifndef QT_MODULE_CANVAS
+#ifndef TQT_MODULE_CANVAS
 # define QT_NO_CANVAS
 #endif
-#ifndef QT_MODULE_TABLE
+#ifndef TQT_MODULE_TABLE
 #define QT_NO_TABLE
 #endif
-#ifndef QT_MODULE_XML
+#ifndef TQT_MODULE_XML
 # define QT_NO_XML
 #endif
-#ifndef QT_MODULE_OPENGL
+#ifndef TQT_MODULE_OPENGL
 # define QT_NO_OPENGL
 #endif
-#if !defined(QT_MODULE_SQL)
+#if !defined(TQT_MODULE_SQL)
 # define QT_NO_SQL
 #endif
 
@@ -863,7 +863,7 @@ class TQDataStream;
 #    define Q_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  elif defined(QT_DLL)		/* use a TQt DLL library */
 #    define Q_EXPORT  __declspec(dllimport)
 #    define Q_TEMPLATEDLL
@@ -874,18 +874,18 @@ class TQDataStream;
 #        define Q_TEMPLATE_EXTERN
 #      endif
 #    endif
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  endif
 #elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
 #  if defined(QT_SHARED)	/* create a TQt shared library */
 #    define Q_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  else
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY 	/* avoid unresolved externals */
 #  endif
 #elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
 #    define Q_EXPORT __attribute__((visibility("default")))
@@ -1042,14 +1042,14 @@ Q_EXPORT void fatal( const char *, ... )	// print fatal message and exit
 Q_EXPORT bool qt_check_pointer( bool c, const char *, int );
 
 #if defined(QT_CHECK_NULL)
-#  define Q_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__))
+#  define TQ_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__))
 #else
-#  define Q_CHECK_PTR(p)
+#  define TQ_CHECK_PTR(p)
 #endif
 
 #if !defined(QT_NO_COMPAT)			// compatibility with TQt 2
 #  if !defined(CHECK_PTR)
-#    define CHECK_PTR(x) Q_CHECK_PTR(x)
+#    define CHECK_PTR(x) TQ_CHECK_PTR(x)
 #  endif
 #endif // QT_NO_COMPAT
 
diff --git a/src/tools/ntqiodevice.h b/src/tools/ntqiodevice.h
index 65c4c59d..33516d07 100644
--- a/src/tools/ntqiodevice.h
+++ b/src/tools/ntqiodevice.h
@@ -154,7 +154,7 @@ private:
     int		 ioSt;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIODevice( const TQIODevice & );
     TQIODevice &operator=( const TQIODevice & );
 #endif
diff --git a/src/tools/ntqlibrary.h b/src/tools/ntqlibrary.h
index 385726b8..c6c92fd5 100644
--- a/src/tools/ntqlibrary.h
+++ b/src/tools/ntqlibrary.h
@@ -74,7 +74,7 @@ private:
     uint aunload : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLibrary( const TQLibrary & );
     TQLibrary &operator=( const TQLibrary & );
 #endif
diff --git a/src/tools/ntqmutex.h b/src/tools/ntqmutex.h
index 90c5150c..2a9afb1d 100644
--- a/src/tools/ntqmutex.h
+++ b/src/tools/ntqmutex.h
@@ -70,7 +70,7 @@ public:
 private:
     TQMutexPrivate * d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMutex( const TQMutex & );
     TQMutex &operator=( const TQMutex & );
 #endif
@@ -87,7 +87,7 @@ public:
 private:
     TQMutex *mtx;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMutexLocker( const TQMutexLocker & );
     TQMutexLocker &operator=( const TQMutexLocker & );
 #endif
diff --git a/src/tools/ntqsemaphore.h b/src/tools/ntqsemaphore.h
index 8b246054..dc6309d5 100644
--- a/src/tools/ntqsemaphore.h
+++ b/src/tools/ntqsemaphore.h
@@ -70,7 +70,7 @@ public:
 private:
     TQSemaphorePrivate *d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSemaphore(const TQSemaphore &);
     TQSemaphore &operator=(const TQSemaphore &);
 #endif
diff --git a/src/tools/ntqsettings.h b/src/tools/ntqsettings.h
index 5c4b24ca..f6a30dac 100644
--- a/src/tools/ntqsettings.h
+++ b/src/tools/ntqsettings.h
@@ -145,7 +145,7 @@ public:
 private:
     TQSettingsPrivate *d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSettings(const TQSettings &);
     TQSettings &operator=(const TQSettings &);
 #endif
diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h
index 85dacc8c..04b319ae 100644
--- a/src/tools/ntqstring.h
+++ b/src/tools/ntqstring.h
@@ -244,7 +244,7 @@ private:
 #if defined(QT_QSTRING_UCS_4)
     ushort grp;
 #endif
-} Q_PACKED;
+} TQ_PACKED;
 
 inline TQChar::TQChar() : ucs( 0 )
 #ifdef QT_QSTRING_UCS_4
@@ -390,7 +390,7 @@ struct Q_EXPORT TQStringData : public TQShared {
     uint islatin1 : 1;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStringData( const TQStringData& );
     TQStringData& operator=( const TQStringData& );
 #endif
diff --git a/src/tools/ntqtextstream.h b/src/tools/ntqtextstream.h
index a99c8e26..e0520a5c 100644
--- a/src/tools/ntqtextstream.h
+++ b/src/tools/ntqtextstream.h
@@ -190,7 +190,7 @@ private:
     TQTextStream &writeBlock( const TQChar* p, uint len );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextStream( const TQTextStream & );
     TQTextStream &operator=( const TQTextStream & );
 #endif
@@ -208,7 +208,7 @@ public:
 	TQTextStream(f,IO_ReadOnly) { }
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextIStream( const TQTextIStream & );
     TQTextIStream &operator=( const TQTextIStream & );
 #endif
@@ -224,7 +224,7 @@ public:
 	TQTextStream(f,IO_WriteOnly) { }
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextOStream( const TQTextOStream & );
     TQTextOStream &operator=( const TQTextOStream & );
 #endif
diff --git a/src/tools/ntqthreadstorage.h b/src/tools/ntqthreadstorage.h
index acce6dba..06edbec3 100644
--- a/src/tools/ntqthreadstorage.h
+++ b/src/tools/ntqthreadstorage.h
@@ -65,11 +65,11 @@ class TQThreadStorage
 private:
     TQThreadStorageData d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     // disable copy constructor and operator=
     TQThreadStorage( const TQThreadStorage & );
     TQThreadStorage &operator=( const TQThreadStorage & );
-#endif // Q_DISABLE_COPY
+#endif // TQ_DISABLE_COPY
 
     static void deleteData( void *x ) { delete (T)x; }
 
diff --git a/src/tools/ntqtl.h b/src/tools/ntqtl.h
index ae8c5af8..ee601c15 100644
--- a/src/tools/ntqtl.h
+++ b/src/tools/ntqtl.h
@@ -72,7 +72,7 @@ public:
 #endif //QT_NO_TEXTSTREAM
 
 template 
-inline OutputIterator qCopy( InputIterator _begin, InputIterator _end,
+inline OutputIterator tqCopy( InputIterator _begin, InputIterator _end,
 			     OutputIterator _dest )
 {
     while( _begin != _end )
@@ -81,7 +81,7 @@ inline OutputIterator qCopy( InputIterator _begin, InputIterator _end,
 }
 
 template 
-inline BiOutputIterator qCopyBackward( BiIterator _begin, BiIterator _end,
+inline BiOutputIterator tqCopyBackward( BiIterator _begin, BiIterator _end,
 				       BiOutputIterator _dest )
 {
     while ( _begin != _end )
@@ -90,7 +90,7 @@ inline BiOutputIterator qCopyBackward( BiIterator _begin, BiIterator _end,
 }
 
 template 
-inline bool qEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2 )
+inline bool tqEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2 )
 {
     // ### compare using !(*first1 == *first2) in TQt 4.0
     for ( ; first1 != last1; ++first1, ++first2 )
@@ -100,7 +100,7 @@ inline bool qEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2
 }
 
 template 
-inline void qFill( ForwardIterator first, ForwardIterator last, const T& val )
+inline void tqFill( ForwardIterator first, ForwardIterator last, const T& val )
 {
     for ( ; first != last; ++first )
 	*first = val;
@@ -122,7 +122,7 @@ inline OutputIterator qReverseCopy( BiIterator _begin, BiIterator _end,
 
 
 template 
-inline InputIterator qFind( InputIterator first, InputIterator last,
+inline InputIterator tqFind( InputIterator first, InputIterator last,
 			    const T& val )
 {
     while ( first != last && *first != val )
@@ -131,7 +131,7 @@ inline InputIterator qFind( InputIterator first, InputIterator last,
 }
 
 template 
-inline void qCount( InputIterator first, InputIterator last, const T& value,
+inline void tqCount( InputIterator first, InputIterator last, const T& value,
 		    Size& n )
 {
     for ( ; first != last; ++first )
@@ -140,7 +140,7 @@ inline void qCount( InputIterator first, InputIterator last, const T& value,
 }
 
 template 
-inline void qSwap( T& _value1, T& _value2 )
+inline void tqSwap( T& _value1, T& _value2 )
 {
     T tmp = _value1;
     _value1 = _value2;
@@ -170,7 +170,7 @@ Q_INLINE_TEMPLATES void qBubbleSort( InputIterator b, InputIterator e )
 	    --y;
 	    if ( *x < *y ) {
 		swapped = TRUE;
-		qSwap( *x, *y );
+		tqSwap( *x, *y );
 		swap_pos = y;
 	    }
 	} while( y != b );
@@ -197,18 +197,18 @@ Q_INLINE_TEMPLATES void qHeapSortPushDown( Value* heap, int first, int last )
 	if ( last == 2 * r ) {
 	    // node r has only one child
 	    if ( heap[2 * r] < heap[r] )
-		qSwap( heap[r], heap[2 * r] );
+		tqSwap( heap[r], heap[2 * r] );
 	    r = last;
 	} else {
 	    // node r has two children
 	    if ( heap[2 * r] < heap[r] && !(heap[2 * r + 1] < heap[2 * r]) ) {
 		// swap with left child
-		qSwap( heap[r], heap[2 * r] );
+		tqSwap( heap[r], heap[2 * r] );
 		r *= 2;
 	    } else if ( heap[2 * r + 1] < heap[r]
 			&& heap[2 * r + 1] < heap[2 * r] ) {
 		// swap with right child
-		qSwap( heap[r], heap[2 * r + 1] );
+		tqSwap( heap[r], heap[2 * r + 1] );
 		r = 2 * r + 1;
 	    } else {
 		r = last;
@@ -231,7 +231,7 @@ Q_INLINE_TEMPLATES void qHeapSortHelper( InputIterator b, InputIterator e, Value
 	heap[++size] = *insert;
 	int i = size;
 	while( i > 1 && heap[i] < heap[i / 2] ) {
-	    qSwap( heap[i], heap[i / 2] );
+	    tqSwap( heap[i], heap[i / 2] );
 	    i /= 2;
 	}
     }
diff --git a/src/tools/ntqvaluelist.h b/src/tools/ntqvaluelist.h
index c217a789..411c2dd7 100644
--- a/src/tools/ntqvaluelist.h
+++ b/src/tools/ntqvaluelist.h
@@ -439,7 +439,7 @@ public:
     TQValueList( const std::list& l )
     {
 	sh = new TQValueListPrivate;
-	qCopy( l.begin(), l.end(), std::back_inserter( *this ) );
+	tqCopy( l.begin(), l.end(), std::back_inserter( *this ) );
     }
 #endif
     ~TQValueList() { sh->derefAndDelete(); }
@@ -455,7 +455,7 @@ public:
     TQValueList& operator= ( const std::list& l )
     {
 	detach();
-	qCopy( l.begin(), l.end(), std::back_inserter( *this ) );
+	tqCopy( l.begin(), l.end(), std::back_inserter( *this ) );
 	return *this;
     }
     bool operator== ( const std::list& l ) const
diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h
index bef40f54..02a15111 100644
--- a/src/tools/ntqvaluevector.h
+++ b/src/tools/ntqvaluevector.h
@@ -130,9 +130,9 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate::TQValueVectorPrivate( const TQValueV
 	finish = start + i;
 	end = start + i;
 #if defined(__xlC__) && __xlC__ < 0x400 // xlC 3.6 confused by const
-	qCopy( (pointer)x.start, (pointer)x.finish, start );
+	tqCopy( (pointer)x.start, (pointer)x.finish, start );
 #else
-	qCopy( x.start, x.finish, start );
+	tqCopy( x.start, x.finish, start );
 #endif
     } else {
 	start = 0;
@@ -163,9 +163,9 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate::insert( pointer pos, const T& x
     const size_t offset = pos - start;
     pointer newStart = new T[n];
     pointer newFinish = newStart + offset;
-    qCopy( start, pos, newStart );
+    tqCopy( start, pos, newStart );
     *newFinish = x;
-    qCopy( pos, finish, ++newFinish );
+    tqCopy( pos, finish, ++newFinish );
     delete[] start;
     start = newStart;
     finish = newStart + lastSize + 1;
@@ -180,31 +180,31 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate::insert( pointer pos, size_t n,
 	const size_t elems_after = finish - pos;
 	pointer old_finish = finish;
 	if ( elems_after > n ) {
-	    qCopy( finish - n, finish, finish );
+	    tqCopy( finish - n, finish, finish );
 	    finish += n;
-	    qCopyBackward( pos, old_finish - n, old_finish );
-	    qFill( pos, pos + n, x );
+	    tqCopyBackward( pos, old_finish - n, old_finish );
+	    tqFill( pos, pos + n, x );
 	} else {
 	    pointer filler = finish;
 	    size_t i = n - elems_after;
 	    for ( ; i > 0; --i, ++filler )
 		*filler = x;
 	    finish += n - elems_after;
-	    qCopy( pos, old_finish, finish );
+	    tqCopy( pos, old_finish, finish );
 	    finish += elems_after;
-	    qFill( pos, old_finish, x );
+	    tqFill( pos, old_finish, x );
 	}
     } else {
 	// not enough room
 	const size_t lastSize = size();
 	const size_t len = lastSize + TQMAX( lastSize, n );
 	pointer newStart = new T[len];
-	pointer newFinish = qCopy( start, pos, newStart );
+	pointer newFinish = tqCopy( start, pos, newStart );
 	// fill up inserted space
 	size_t i = n;
 	for ( ; i > 0; --i, ++newFinish )
 	    *newFinish = x;
-	newFinish = qCopy( pos, finish, newFinish );
+	newFinish = tqCopy( pos, finish, newFinish );
 	delete[] start;
 	start = newStart;
 	finish = newFinish;
@@ -226,7 +226,7 @@ template 
 Q_INLINE_TEMPLATES Q_TYPENAME TQValueVectorPrivate::pointer TQValueVectorPrivate::growAndCopy( size_t n, pointer s, pointer f )
 {
     pointer newStart = new T[n];
-    qCopy( s, f, newStart );
+    tqCopy( s, f, newStart );
     delete[] start;
     return newStart;
 }
@@ -268,13 +268,13 @@ public:
     TQValueVector( std::vector& v ) // ### remove in 4.0
     {
 	sh = new TQValueVectorPrivate( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
     }
 
     TQValueVector( const std::vector& v )
     {
 	sh = new TQValueVectorPrivate( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
     }
 #endif
 
@@ -296,7 +296,7 @@ public:
     {
 	clear();
 	resize( v.size() );
-	qCopy( v.begin(), v.end(), begin() );
+	tqCopy( v.begin(), v.end(), begin() );
 	return *this;
     }
 #endif
@@ -441,7 +441,7 @@ public:
     {
 	detach();
 	if ( pos + 1 != end() )
-	    qCopy( pos + 1, sh->finish, pos );
+	    tqCopy( pos + 1, sh->finish, pos );
 	--sh->finish;
 	return pos;
     }
@@ -449,7 +449,7 @@ public:
     iterator erase( iterator first, iterator last )
     {
 	detach();
-	qCopy( last, sh->finish, first );
+	tqCopy( last, sh->finish, first );
 	sh->finish = sh->finish - ( last - first );
 	return first;
     }
@@ -457,12 +457,12 @@ public:
     // ### remove in TQt 4.0
     bool operator==( const TQValueVector& x )
     {
-	return size()==x.size() ? qEqual( constBegin(), constEnd(), x.begin()) : FALSE;
+	return size()==x.size() ? tqEqual( constBegin(), constEnd(), x.begin()) : FALSE;
     }
 
     bool operator==( const TQValueVector& x ) const
     {
-	return size()==x.size() ? qEqual( begin(), end(), x.begin() ) : FALSE;
+	return size()==x.size() ? tqEqual( begin(), end(), x.begin() ) : FALSE;
     }
 
     typedef T ValueType;
@@ -494,7 +494,7 @@ template 
 Q_INLINE_TEMPLATES TQValueVector::TQValueVector( size_type n, const T& val )
 {
     sh = new TQValueVectorPrivate( n );
-    qFill( begin(), end(), val );
+    tqFill( begin(), end(), val );
 }
 
 template 
@@ -522,7 +522,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector::iterator TQValueVector::inser
 	} else {
 	    *sh->finish = *(sh->finish - 1);
 	    ++sh->finish;
-	    qCopyBackward( pos, sh->finish - 2, sh->finish - 1 );
+	    tqCopyBackward( pos, sh->finish - 2, sh->finish - 1 );
 	    *pos = x;
 	}
     }
diff --git a/src/tools/ntqwaitcondition.h b/src/tools/ntqwaitcondition.h
index 6e603880..7b8475f2 100644
--- a/src/tools/ntqwaitcondition.h
+++ b/src/tools/ntqwaitcondition.h
@@ -68,7 +68,7 @@ public:
 private:
     TQWaitConditionPrivate * d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWaitCondition( const TQWaitCondition & );
     TQWaitCondition &operator=( const TQWaitCondition & );
 #endif
diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp
index c1433887..a374cc6c 100644
--- a/src/tools/qbitarray.cpp
+++ b/src/tools/qbitarray.cpp
@@ -145,7 +145,7 @@
 TQBitArray::TQBitArray() : TQByteArray( 0, 0 )
 {
     bitarr_data *x = new bitarr_data;
-    Q_CHECK_PTR( x );
+    TQ_CHECK_PTR( x );
     x->nbits = 0;
     setSharedBlock( x );
 }
@@ -159,7 +159,7 @@ TQBitArray::TQBitArray() : TQByteArray( 0, 0 )
 TQBitArray::TQBitArray( uint size ) : TQByteArray( 0, 0 )
 {
     bitarr_data *x = new bitarr_data;
-    Q_CHECK_PTR( x );
+    TQ_CHECK_PTR( x );
     x->nbits = 0;
     setSharedBlock( x );
     resize( size );
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index 0bf1f4ae..a53c79c8 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -297,9 +297,9 @@ public:		   \
 #  define Q_UCM_VERIFICATION_DATA \
 	static const char *qt_ucm_verification_data =			\
             "pattern=""QT_UCM_VERIFICATION_DATA""\n"			\
-            "version="QT_VERSION_STR"\n"				\
+            "version="TQT_VERSION_STR"\n"				\
             "flags="Q_UCM_FLAGS_STRING"\n"				\
-	    "buildkey="QT_BUILD_KEY"\0";
+	    "buildkey="TQT_BUILD_KEY"\0";
 #endif // Q_UCM_VERIFICATION_DATA
 
 // This macro expands to the default implementation of ucm_instantiate.
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index c6d22e2e..5869d3e3 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -103,8 +103,8 @@ static bool qt_verify( const TQString& library, uint version, uint flags,
 	    qWarning( "Conflict in %s:\n"
 		      "  Plugin cannot be queried successfully!",
 		      (const char*) TQFile::encodeName(library) );
-    } else if ( ( version > QT_VERSION ) ||
-		( ( QT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) {
+    } else if ( ( version > TQT_VERSION ) ||
+		( ( TQT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) {
 	if ( warn )
 	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible TQt library (%d.%d.%d)!",
@@ -116,13 +116,13 @@ static bool qt_verify( const TQString& library, uint version, uint flags,
 		      "  Plugin uses %s TQt library!",
 		      (const char*) TQFile::encodeName(library),
 		      (flags & 2) ? "multi threaded" : "single threaded" );
-    } else if ( key != QT_BUILD_KEY ) {
+    } else if ( key != TQT_BUILD_KEY ) {
 	if ( warn )
 	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible TQt library!\n"
 		      "  expected build key \"%s\", got \"%s\".",
 		      (const char*) TQFile::encodeName(library),
-		      QT_BUILD_KEY,
+		      TQT_BUILD_KEY,
 		      key.isEmpty() ? "" : (const char *) key );
     } else {
 	return TRUE;
@@ -214,7 +214,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 
     qt_token_info pinfo("=\n", 2);
     int parse;
-    ulong at = 0, advance, parselen = qstrlen( s );
+    ulong at = 0, advance, parselen = tqstrlen( s );
     do {
 	parse = qt_tokenize( s + at, parselen, &advance, pinfo );
 	if ( parse == -1 ) {
@@ -225,7 +225,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 	at += advance;
 	parselen -= advance;
 
-	if ( qstrncmp( "version", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
+	if ( tqstrncmp( "version", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
 	    // parse version string
 	    qt_token_info pinfo2("..-", 3);
 	    if ( qt_tokenize( pinfo.results[ 1 ], pinfo.lengths[ 1 ],
@@ -238,7 +238,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 		ret = FALSE;
 		break;
 	    }
-	} else if ( qstrncmp( "flags", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
+	} else if ( tqstrncmp( "flags", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
 	    // parse flags string
 	    char ch;
 	    *flags = 0;
@@ -255,7 +255,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 		}
 		++p;
 	    }
-	} else if ( qstrncmp( "buildkey", pinfo.results[ 0 ],
+	} else if ( tqstrncmp( "buildkey", pinfo.results[ 0 ],
 			      pinfo.lengths[ 0 ] ) == 0 ){
 	    // save buildkey
 	    *key = TQCString( pinfo.results[ 1 ], pinfo.lengths[ 1 ] + 1 );
@@ -299,7 +299,7 @@ static long qt_find_pattern( const char *s, ulong s_len,
     }
     i = delta;
     for (;;) {
-	if ( hs == hp && qstrncmp( s + i, pattern, p_len ) == 0 )
+	if ( hs == hp && tqstrncmp( s + i, pattern, p_len ) == 0 )
 	    return i;
 	if ( i == 0 )
 	    break;
@@ -357,7 +357,7 @@ static bool qt_unix_query( const TQString &library, uint *version, uint *flags,
 
     // verify that the pattern is present in the plugin
     const char *pattern = "pattern=QT_UCM_VERIFICATION_DATA";
-    const ulong plen = qstrlen( pattern );
+    const ulong plen = tqstrlen( pattern );
     long pos = qt_find_pattern( filedata, fdlen, pattern, plen );
 
     bool ret = FALSE;
@@ -389,8 +389,8 @@ void TQComLibrary::createInstanceInternal()
     TQFileInfo fileinfo( library() );
     TQString lastModified  = fileinfo.lastModified().toString(TQt::ISODate);
     TQString regkey = TQString("/TQt Plugins %1.%2/%3")
-		     .arg( ( QT_VERSION & 0xff0000 ) >> 16 )
-		     .arg( ( QT_VERSION & 0xff00 ) >> 8 )
+		     .arg( ( TQT_VERSION & 0xff0000 ) >> 16 )
+		     .arg( ( TQT_VERSION & 0xff00 ) >> 8 )
 		     .arg( library() );
     TQStringList reg;
     uint flags = 0;
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index 60e698f3..8e7a1d14 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -105,7 +105,7 @@ char *qstrdup( const char *src )
     if ( !src )
 	return 0;
     char *dst = new char[strlen(src)+1];
-    Q_CHECK_PTR( dst );
+    TQ_CHECK_PTR( dst );
     return strcpy( dst, src );
 }
 
@@ -144,7 +144,7 @@ char *qstrncpy( char *dst, const char *src, uint len )
 }
 
 /*!
-    \fn uint qstrlen( const char *str );
+    \fn uint tqstrlen( const char *str );
 
     \relates TQCString
 
@@ -170,12 +170,12 @@ char *qstrncpy( char *dst, const char *src, uint len )
     Special case II: Returns a random nonzero value if \a str1 is 0
     or \a str2 is 0 (but not both).
 
-    \sa qstrncmp() qstricmp() qstrnicmp()
+    \sa tqstrncmp() qstricmp() qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
 /*!
-    \fn int qstrncmp( const char *str1, const char *str2, uint len );
+    \fn int tqstrncmp( const char *str1, const char *str2, uint len );
 
     \relates TQCString
 
@@ -212,7 +212,7 @@ char *qstrncpy( char *dst, const char *src, uint len )
     Special case II: Returns a random nonzero value if \a str1 is 0
     or \a str2 is 0 (but not both).
 
-    \sa qstrcmp(), qstrncmp(), qstrnicmp()
+    \sa qstrcmp(), tqstrncmp(), qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
@@ -246,7 +246,7 @@ int qstricmp( const char *str1, const char *str2 )
     Special case II: Returns a random nonzero value if \a str1 is 0
     or \a str2 is 0 (but not both).
 
-    \sa qstrcmp(), qstrncmp() qstricmp()
+    \sa qstrcmp(), tqstrncmp() qstricmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
@@ -342,7 +342,7 @@ Q_UINT16 qChecksum( const char *data, uint len )
     Compresses the array \a data and returns the compressed byte
     array using zlib.
 
-    \sa qUncompress()
+    \sa tqUncompress()
 */
 
 /*!
@@ -401,7 +401,7 @@ TQByteArray qCompress( const uchar* data, int nbytes )
 #endif
 
 /*!
-    \fn TQByteArray qUncompress( const TQByteArray& data )
+    \fn TQByteArray tqUncompress( const TQByteArray& data )
 
     \relates TQByteArray
 
@@ -429,7 +429,7 @@ TQByteArray qCompress( const uchar* data, int nbytes )
 */
 
 #ifndef QT_NO_COMPRESS
-TQByteArray qUncompress( const uchar* data, int nbytes )
+TQByteArray tqUncompress( const uchar* data, int nbytes )
 {
     if ( !data ) {
 #if defined(QT_CHECK_RANGE)
@@ -699,7 +699,7 @@ TQCString::TQCString( int size )
 
 TQCString::TQCString( const char *str )
 {
-    duplicate( str, qstrlen(str) + 1 );
+    duplicate( str, tqstrlen(str) + 1 );
 }
 
 
@@ -887,7 +887,7 @@ TQCString &TQCString::sprintf( const char *format, ... )
 #else
     vsprintf( data(), format, ap );
 #endif
-    resize( qstrlen(data()) + 1 );		// truncate
+    resize( tqstrlen(data()) + 1 );		// truncate
     va_end( ap );
     return *this;
 }
@@ -987,7 +987,7 @@ int TQCString::find( const char *str, int index, bool cs, uint l ) const
 	return -1;
     if ( !*str )
 	return index;
-    const uint sl = qstrlen( str );
+    const uint sl = tqstrlen( str );
     if ( sl + index > l )
 	return -1;
 
@@ -1013,7 +1013,7 @@ int TQCString::find( const char *str, int index, bool cs, uint l ) const
 	while ( haystack <= end ) {
 	    hashHaystack += *(haystack+sl_minus_1);
  	    if ( hashHaystack == hashNeedle  && *needle == *haystack
-		 && qstrncmp( needle, haystack, sl ) == 0 )
+		 && tqstrncmp( needle, haystack, sl ) == 0 )
 		return haystack - data();
 
 	    REHASH( *haystack );
@@ -1094,7 +1094,7 @@ int TQCString::findRev( const char *str, int index, bool cs ) const
     /*
       See TQString::find() for explanations.
     */
-    const uint sl = qstrlen( str );
+    const uint sl = tqstrlen( str );
     const uint l = length();
     int delta = l-sl;
     if ( index < 0 )
@@ -1123,7 +1123,7 @@ int TQCString::findRev( const char *str, int index, bool cs ) const
 	hashHaystack -= *haystack;
 	while ( haystack >= end ) {
 	    hashHaystack += *haystack;
- 	    if ( hashHaystack == hashNeedle  && qstrncmp( needle, haystack, sl ) == 0 )
+ 	    if ( hashHaystack == hashNeedle  && tqstrncmp( needle, haystack, sl ) == 0 )
 		return haystack-data();
 	    --haystack;
 	    REHASH( *(haystack+sl) );
@@ -1283,7 +1283,7 @@ TQCString TQCString::right( uint len ) const
 
 TQCString TQCString::mid( uint index, uint len ) const
 {
-    uint slen = qstrlen( data() );
+    uint slen = tqstrlen( data() );
     if ( isEmpty() || index >= slen ) {
 	TQCString empty;
 	return empty;
@@ -1319,7 +1319,7 @@ TQCString TQCString::mid( uint index, uint len ) const
 TQCString TQCString::leftJustify( uint width, char fill, bool truncate ) const
 {
     TQCString result;
-    int len = qstrlen(data());
+    int len = tqstrlen(data());
     int padlen = width - len;
     if ( padlen > 0 ) {
 	result.TQByteArray::resize( len+padlen+1 );
@@ -1357,7 +1357,7 @@ TQCString TQCString::leftJustify( uint width, char fill, bool truncate ) const
 TQCString TQCString::rightJustify( uint width, char fill, bool truncate ) const
 {
     TQCString result;
-    int len = qstrlen(data());
+    int len = tqstrlen(data());
     int padlen = width - len;
     if ( padlen > 0 ) {
 	result.TQByteArray::resize( len+padlen+1 );
@@ -1534,7 +1534,7 @@ TQCString TQCString::simplifyWhiteSpace() const
 
 TQCString &TQCString::insert( uint index, const char *s )
 {
-    int len = qstrlen(s);
+    int len = tqstrlen(s);
     if ( len == 0 )
 	return *this;
     uint olen = length();
@@ -2090,7 +2090,7 @@ TQCString &TQCString::setStr( const char *str )
 {
     detach();
     if ( str )					// valid string
-	store( str, qstrlen(str)+1 );
+	store( str, tqstrlen(str)+1 );
     else					// empty
 	resize( 0 );
     return *this;
@@ -2122,7 +2122,7 @@ TQCString &TQCString::setNum( long n )
     } while ( n );
     if ( neg )
 	*--p = '-';
-    store( p, qstrlen(p)+1 );
+    store( p, tqstrlen(p)+1 );
     return *this;
 }
 
@@ -2143,7 +2143,7 @@ TQCString &TQCString::setNum( ulong n )
 	*--p = ((int)(n%10)) + '0';
 	n /= 10;
     } while ( n );
-    store( p, qstrlen(p)+1 );
+    store( p, tqstrlen(p)+1 );
     return *this;
 }
 
@@ -2263,7 +2263,7 @@ TQCString& TQCString::operator+=( const char *str )
 	return *this;				// nothing to append
     detach();
     uint len1 = length();
-    uint len2 = qstrlen(str);
+    uint len2 = tqstrlen(str);
     if ( !TQByteArray::resize( len1 + len2 + 1, TQByteArray::SpeedOptim ) )
 	return *this;				// no memory
     memcpy( data() + len1, str, len2 + 1 );
diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp
index 3359d68b..deab90bb 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/qdatastream.cpp
@@ -810,7 +810,7 @@ TQDataStream &TQDataStream::readBytes( char *&s, uint &l )
 	return *this;
     } else {
 	s = new char[len];			// create char array
-	Q_CHECK_PTR( s );
+	TQ_CHECK_PTR( s );
 	if ( !s )				// no memory
 	    return *this;
 	return readRawBytes( s, (uint)len );
@@ -1115,7 +1115,7 @@ TQDataStream &TQDataStream::operator<<( const char *s )
 	*this << (Q_UINT32)0;
 	return *this;
     }
-    uint len = qstrlen( s ) + 1;			// also write null terminator
+    uint len = tqstrlen( s ) + 1;			// also write null terminator
     *this << (Q_UINT32)len;			// write length specifier
     return writeRawBytes( s, len );
 }
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index c5d7173e..54ca9df5 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -98,7 +98,10 @@ TQString TQDir::canonicalPath() const
 	slashify( r );
 
     	// always make sure we go back to the current dir
-	::chdir( cur );
+	if (::chdir( cur ) < 0) {
+		// Error!
+		// FIXME
+	}
     }
 #endif  /* __GLIBC__ && !PATH_MAX */
     return r;
@@ -206,9 +209,9 @@ bool TQDir::readDirEntries( const TQString &nameFilter,
     int i;
     if ( !fList ) {
 	fList  = new TQStringList;
-	Q_CHECK_PTR( fList );
+	TQ_CHECK_PTR( fList );
 	fiList = new TQFileInfoList;
-	Q_CHECK_PTR( fiList );
+	TQ_CHECK_PTR( fiList );
 	fiList->setAutoDelete( TRUE );
     } else {
 	fList->clear();
diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp
index ab5248fe..dc0a2427 100644
--- a/src/tools/qfile.cpp
+++ b/src/tools/qfile.cpp
@@ -371,7 +371,7 @@ Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen )
     if ( maxlen == 0 )				// application bug?
 	return 0;
 #if defined(QT_CHECK_STATE)
-    Q_CHECK_PTR( p );
+    TQ_CHECK_PTR( p );
     if ( !isOpen() ) {				// file not open
 	qWarning( "TQFile::readLine: File not open" );
 	return -1;
@@ -387,7 +387,7 @@ Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen )
     } else {					// buffered file
 	p = fgets( p, maxlen, fh );
 	if ( p ) {
-	    nread = qstrlen( p );
+	    nread = tqstrlen( p );
 	    if ( !isSequentialAccess() )
 		ioIndex += nread;
 	} else {
diff --git a/src/tools/qfile_unix.cpp b/src/tools/qfile_unix.cpp
index 85d0fd4f..c65bf922 100644
--- a/src/tools/qfile_unix.cpp
+++ b/src/tools/qfile_unix.cpp
@@ -321,7 +321,7 @@ bool TQFile::open( int m )
     {
 	TQFile f;
 	f.open( IO_WriteOnly, stderr );
-	f.writeBlock( msg, qstrlen(msg) );	// write to stderr
+	f.writeBlock( msg, tqstrlen(msg) );	// write to stderr
 	f.close();
     }
   \endcode
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index 014e037c..288df5b6 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -253,7 +253,7 @@ TQFileInfo &TQFileInfo::operator=( const TQFileInfo &fi )
     } else {
 	if ( !fic ) {
 	    fic = new TQFileInfoCache;
-	    Q_CHECK_PTR( fic );
+	    TQ_CHECK_PTR( fic );
 	}
 	*fic = *fi.fic;
     }
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index 4d7fd38e..8eba534c 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -116,7 +116,7 @@
 TQGArray::TQGArray()
 {
     shd = newData();
-    Q_CHECK_PTR( shd );
+    TQ_CHECK_PTR( shd );
 }
 
 /*!
@@ -143,11 +143,11 @@ TQGArray::TQGArray( int size )
 	size = 0;
     }
     shd = newData();
-    Q_CHECK_PTR( shd );
+    TQ_CHECK_PTR( shd );
     if ( size == 0 )				// zero length
 	return;
     shd->data = NEW(char,size);
-    Q_CHECK_PTR( shd->data );
+    TQ_CHECK_PTR( shd->data );
     shd->len =
 #ifdef QT_QGARRAY_SPEED_OPTIM
 	shd->maxl =
@@ -375,7 +375,7 @@ TQGArray &TQGArray::assign( const char *d, uint len )
     if ( shd->count > 1 ) {			// disconnect this
 	shd->count--;
 	shd = newData();
-	Q_CHECK_PTR( shd );
+	TQ_CHECK_PTR( shd );
     } else {
 	if ( shd->data )
 	    DELETE(shd->data);
@@ -401,10 +401,10 @@ TQGArray &TQGArray::duplicate( const TQGArray &a )
 	if ( shd->count > 1 ) {
 	    shd->count--;
 	    register array_data *n = newData();
-	    Q_CHECK_PTR( n );
+	    TQ_CHECK_PTR( n );
 	    if ( (n->len=shd->len) ) {
 		n->data = NEW(char,n->len);
-		Q_CHECK_PTR( n->data );
+		TQ_CHECK_PTR( n->data );
 		if ( n->data )
 		    memcpy( n->data, shd->data, n->len );
 	    } else {
@@ -418,13 +418,13 @@ TQGArray &TQGArray::duplicate( const TQGArray &a )
     if ( shd->count > 1 ) {			// disconnect this
 	shd->count--;
 	shd = newData();
-	Q_CHECK_PTR( shd );
+	TQ_CHECK_PTR( shd );
     } else {					// delete after copy was made
 	oldptr = shd->data;
     }
     if ( a.shd->len ) {				// duplicate data
 	shd->data = NEW(char,a.shd->len);
-	Q_CHECK_PTR( shd->data );
+	TQ_CHECK_PTR( shd->data );
 	if ( shd->data )
 	    memcpy( shd->data, a.shd->data, a.shd->len );
     } else {
@@ -461,13 +461,13 @@ TQGArray &TQGArray::duplicate( const char *d, uint len )
 	    return *this;
 	}
 	data = NEW(char,len);
-	Q_CHECK_PTR( data );
+	TQ_CHECK_PTR( data );
 	memcpy( data, d, len );
     }
     if ( shd->count > 1 ) {			// detach
 	shd->count--;
 	shd = newData();
-	Q_CHECK_PTR( shd );
+	TQ_CHECK_PTR( shd );
     } else {					// just a single reference
 	if ( shd->data )
 	    DELETE(shd->data);
diff --git a/src/tools/qgcache.cpp b/src/tools/qgcache.cpp
index 190e3c9e..a67112f9 100644
--- a/src/tools/qgcache.cpp
+++ b/src/tools/qgcache.cpp
@@ -256,11 +256,11 @@ TQGCache::TQGCache( int maxCost, uint size, KeyType kt, bool caseSensitive,
 {
     keytype = kt;
     lruList = new TQCList;
-    Q_CHECK_PTR( lruList );
+    TQ_CHECK_PTR( lruList );
     lruList->setAutoDelete( TRUE );
     copyk   = ((keytype == AsciiKey) && copyKeys);
     dict    = new TQCDict( size, kt, caseSensitive, FALSE );
-    Q_CHECK_PTR( dict );
+    TQ_CHECK_PTR( dict );
     mCost   = maxCost;
     tCost   = 0;
 #if defined(QT_DEBUG)
@@ -389,7 +389,7 @@ bool TQGCache::insert_string( const TQString &key, TQPtrCollection::Item data,
 	priority = 32677;
     TQCacheItem *ci = new TQCacheItem( new TQString(key), newItem(data),
 				     cost, (short)priority );
-    Q_CHECK_PTR( ci );
+    TQ_CHECK_PTR( ci );
     lruList->insert( 0, ci );
     dict->insert_string( key, ci );
     tCost += cost;
@@ -420,7 +420,7 @@ bool TQGCache::insert_other( const char *key, TQPtrCollection::Item data,
 	priority = 32677;
     TQCacheItem *ci = new TQCacheItem( (void*)key, newItem(data), cost,
 				     (short)priority );
-    Q_CHECK_PTR( ci );
+    TQ_CHECK_PTR( ci );
     lruList->insert( 0, ci );
     if ( keytype == AsciiKey )
 	dict->insert_ascii( key, ci );
@@ -641,7 +641,7 @@ void TQGCache::statistics() const
 #if defined(QT_DEBUG)
     TQString line;
     line.fill( '*', 80 );
-    qDebug( line.ascii() );
+    qDebug( "%s", line.ascii() );
     qDebug( "CACHE STATISTICS:" );
     qDebug( "cache contains %d item%s, with a total cost of %d",
 	   count(), count() != 1 ? "s" : "", tCost );
@@ -662,7 +662,7 @@ void TQGCache::statistics() const
 	   lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts );
     qDebug( "Statistics from internal dictionary class:" );
     dict->statistics();
-    qDebug( line.ascii() );
+    qDebug( "%s", line.ascii() );
 #endif
 }
 
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index 99c0cbc2..ac54098f 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -210,7 +210,7 @@ void TQGDict::init( uint len, KeyType kt, bool caseSensitive, bool copyKeys )
     vlen = len ? len : 17;
     vec = new TQBaseBucket *[ vlen ];
 
-    Q_CHECK_PTR( vec );
+    TQ_CHECK_PTR( vec );
     memset( (char*)vec, 0, vlen*sizeof(TQBaseBucket*) );
     numItems  = 0;
     iterators = 0;
@@ -358,7 +358,7 @@ TQPtrCollection::Item TQGDict::look_string( const TQString &key, TQPtrCollection
     }
     // op_insert or op_replace
     n = new TQStringBucket(key,newItem(d),vec[index]);
-    Q_CHECK_PTR( n );
+    TQ_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
 	qWarning( "TQDict: Cannot insert null item" );
@@ -394,7 +394,7 @@ TQPtrCollection::Item TQGDict::look_ascii( const char *key, TQPtrCollection::Ite
     }
     // op_insert or op_replace
     n = new TQAsciiBucket(copyk ? qstrdup(key) : key,newItem(d),vec[index]);
-    Q_CHECK_PTR( n );
+    TQ_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
 	qWarning( "TQAsciiDict: Cannot insert null item" );
@@ -422,7 +422,7 @@ TQPtrCollection::Item TQGDict::look_int( long key, TQPtrCollection::Item d, int
     }
     // op_insert or op_replace
     n = new TQIntBucket(key,newItem(d),vec[index]);
-    Q_CHECK_PTR( n );
+    TQ_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
 	qWarning( "TQIntDict: Cannot insert null item" );
@@ -450,7 +450,7 @@ TQPtrCollection::Item TQGDict::look_ptr( void *key, TQPtrCollection::Item d, int
     }
     // op_insert or op_replace
     n = new TQPtrBucket(key,newItem(d),vec[index]);
-    Q_CHECK_PTR( n );
+    TQ_CHECK_PTR( n );
 #if defined(QT_CHECK_NULL)
     if ( n->getData() == 0 )
 	qWarning( "TQPtrDict: Cannot insert null item" );
@@ -474,7 +474,7 @@ void TQGDict::resize( uint newsize )
     bool old_copyk = copyk;
 
     vec = new TQBaseBucket *[vlen = newsize];
-    Q_CHECK_PTR( vec );
+    TQ_CHECK_PTR( vec );
     memset( (char*)vec, 0, vlen*sizeof(TQBaseBucket*) );
     numItems = 0;
     copyk = FALSE;
@@ -846,11 +846,11 @@ void TQGDict::statistics() const
     TQString line;
     line.fill( '-', 60 );
     double real, ideal;
-    qDebug( line.ascii() );
+    qDebug( "%s", line.ascii() );
     qDebug( "DICTIONARY STATISTICS:" );
     if ( count() == 0 ) {
 	qDebug( "Empty!" );
-	qDebug( line.ascii() );
+	qDebug( "%s", line.ascii() );
 	return;
     }
     real = 0.0;
@@ -871,7 +871,7 @@ void TQGDict::statistics() const
 	while ( b-- )
 	    *pbuf++ = '*';
 	*pbuf = '\0';
-	qDebug( buf );
+	qDebug( "%s", buf );
 	i++;
     }
     qDebug( "Array size = %d", size() );
@@ -879,7 +879,7 @@ void TQGDict::statistics() const
     qDebug( "Real dist  = %g", real );
     qDebug( "Rand dist  = %g", ideal );
     qDebug( "Real/Rand  = %g", real/ideal );
-    qDebug( line.ascii() );
+    qDebug( "%s", line.ascii() );
 #endif // QT_DEBUG
 }
 
@@ -1018,7 +1018,7 @@ TQGDictIterator::TQGDictIterator( const TQGDict &d )
     toFirst();					// set to first noe
     if ( !dict->iterators ) {
 	dict->iterators = new TQGDItList;	// create iterator list
-	Q_CHECK_PTR( dict->iterators );
+	TQ_CHECK_PTR( dict->iterators );
     }
     dict->iterators->append( this );		// attach iterator to dict
 }
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index c9f14102..b67b1154 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -386,7 +386,7 @@ void TQGList::inSort( TQPtrCollection::Item d )
 void TQGList::prepend( TQPtrCollection::Item d )
 {
     register TQLNode *n = new TQLNode( newItem(d) );
-    Q_CHECK_PTR( n );
+    TQ_CHECK_PTR( n );
     n->prev = 0;
     if ( (n->next = firstNode) )		// list is not empty
 	firstNode->prev = n;
@@ -405,7 +405,7 @@ void TQGList::prepend( TQPtrCollection::Item d )
 void TQGList::append( TQPtrCollection::Item d )
 {
     register TQLNode *n = new TQLNode( newItem(d) );
-    Q_CHECK_PTR( n );
+    TQ_CHECK_PTR( n );
     n->next = 0;
     if ( (n->prev = lastNode) )			// list is not empty
 	lastNode->next = n;
@@ -435,7 +435,7 @@ bool TQGList::insertAt( uint index, TQPtrCollection::Item d )
 	return FALSE;
     TQLNode *prevNode = nextNode->prev;
     register TQLNode *n = new TQLNode( newItem(d) );
-    Q_CHECK_PTR( n );
+    TQ_CHECK_PTR( n );
     nextNode->prev = n;
     prevNode->next = n;
     n->prev = prevNode;				// link new node into list
@@ -1025,11 +1025,11 @@ TQDataStream &TQGList::read( TQDataStream &s )
     while ( num-- ) {				// read all items
 	Item d;
 	read( s, d );
-	Q_CHECK_PTR( d );
+	TQ_CHECK_PTR( d );
 	if ( !d )				// no memory
 	    break;
 	TQLNode *n = new TQLNode( d );
-	Q_CHECK_PTR( n );
+	TQ_CHECK_PTR( n );
 	if ( !n )				// no memory
 	    break;
 	n->next = 0;
@@ -1102,7 +1102,7 @@ TQGListIterator::TQGListIterator( const TQGList &l )
     curNode = list->firstNode;			// set to first node
     if ( !list->iterators ) {
 	list->iterators = new TQGListIteratorList;		// create iterator list
-	Q_CHECK_PTR( list->iterators );
+	TQ_CHECK_PTR( list->iterators );
     }
     list->iterators->add( this );		// attach iterator to list
 }
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 2336fb0b..baf6e6f6 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -58,14 +58,14 @@
     Returns the TQt version number as a string, for example, "2.3.0" or
     "3.0.5".
 
-    The \c QT_VERSION define has the numeric value in the form:
+    The \c TQT_VERSION define has the numeric value in the form:
     0xmmiibb (m = major, i = minor, b = bugfix). For example, TQt
-    3.0.5's \c QT_VERSION is 0x030005.
+    3.0.5's \c TQT_VERSION is 0x030005.
 */
 
 const char *qVersion()
 {
-    return QT_VERSION_STR;
+    return TQT_VERSION_STR;
 }
 
 bool qSharedBuild()
@@ -591,10 +591,10 @@ void qFatal( const char *msg, ... )
 	abort();				// trap; generates core dump
 #elif defined(Q_OS_TEMP) && defined(QT_DEBUG)
 	TQString fstr;
-	fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, QT_VERSION_STR, buf );
+	fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, TQT_VERSION_STR, buf );
 	OutputDebugString( fstr.ucs2() );
 #elif defined(_CRT_ERROR) && defined(_DEBUG)
-	_CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, QT_VERSION_STR, buf );
+	_CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, TQT_VERSION_STR, buf );
 #else
 	exit( 1 );				// goodbye cruel world
 #endif
@@ -625,10 +625,10 @@ void fatal( const char *msg, ... )
 	abort();				// trap; generates core dump
 #elif defined(Q_OS_TEMP) && defined(QT_DEBUG)
 	TQString fstr;
-	fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, QT_VERSION_STR, buf );
+	fstr.sprintf( "%s:%s %s %s\n", __FILE__, __LINE__, TQT_VERSION_STR, buf );
 	OutputDebugString( fstr.ucs2() );
 #elif defined(_CRT_ERROR) && defined(_DEBUG)
-	_CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, QT_VERSION_STR, buf );
+	_CrtDbgReport( _CRT_ERROR, __FILE__, __LINE__, TQT_VERSION_STR, buf );
 #else
 	exit( 1 );				// goodbye cruel world
 #endif
@@ -729,7 +729,7 @@ void qSystemWarning( const char* msg, int code )
 
 
 /*!
-    \fn void Q_CHECK_PTR( void *p )
+    \fn void TQ_CHECK_PTR( void *p )
 
     \relates TQApplication
 
@@ -742,10 +742,10 @@ void qSystemWarning( const char* msg, int code )
     \code
 	int *a;
 
-	Q_CHECK_PTR( a = new int[80] );  // WRONG!
+	TQ_CHECK_PTR( a = new int[80] );  // WRONG!
 
 	a = new (nothrow) int[80];       // Right
-	Q_CHECK_PTR( a );
+	TQ_CHECK_PTR( a );
     \endcode
 
     \sa qWarning(), \link debug.html Debugging\endlink
@@ -753,11 +753,11 @@ void qSystemWarning( const char* msg, int code )
 
 
 //
-// The Q_CHECK_PTR macro calls this function to check if an allocation went ok.
+// The TQ_CHECK_PTR macro calls this function to check if an allocation went ok.
 //
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
-#warning "Change Q_CHECK_PTR to '{if ((p)==0) qt_check_pointer(__FILE__,__LINE__);}'"
+#warning "Change TQ_CHECK_PTR to '{if ((p)==0) qt_check_pointer(__FILE__,__LINE__);}'"
 #warning "No need for qt_check_pointer() to return a value - make it void!"
 #endif
 #endif
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index 5afd8bc4..5c428f92 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -398,7 +398,7 @@ const TQLibrary* TQGPluginManager::library( const TQString& feature ) const
 		    same.append( new TQComLibrary( *bit ) );
 		TQComLibrary* bestMatch = 0;
 		for ( TQComLibrary* candidate = same.first(); candidate; candidate = same.next() )
-		    if ( candidate->qtVersion() && candidate->qtVersion() <= QT_VERSION
+		    if ( candidate->qtVersion() && candidate->qtVersion() <= TQT_VERSION
 			 && ( !bestMatch || candidate->qtVersion() > bestMatch->qtVersion() ) )
 			bestMatch = candidate;
 		if ( bestMatch ) {
@@ -435,7 +435,7 @@ TQStringList TQGPluginManager::featureList() const
 	if ( (*it).isEmpty() || libDict[*it] )
 	    continue;
 	TQComLibrary* library = new TQComLibrary( *it );
-	if ( library->qtVersion() == QT_VERSION ) {
+	if ( library->qtVersion() == TQT_VERSION ) {
 	    that->addLibrary( library );
 	    phase2Deny << TQFileInfo( *it ).baseName();
 	} else {
@@ -491,11 +491,11 @@ bool TQGPluginManager::addLibrary( TQLibrary* lib )
 		TQComLibrary* first = (TQComLibrary*)old;
 		TQComLibrary* second = (TQComLibrary*)plugin;
 		bool takeFirst = TRUE;
-		if ( first->qtVersion() != QT_VERSION ) {
-		    if ( second->qtVersion() == QT_VERSION )
+		if ( first->qtVersion() != TQT_VERSION ) {
+		    if ( second->qtVersion() == TQT_VERSION )
 			takeFirst = FALSE;
-		    else if ( second->qtVersion() < QT_VERSION &&
-			      first->qtVersion() > QT_VERSION )
+		    else if ( second->qtVersion() < TQT_VERSION &&
+			      first->qtVersion() > TQT_VERSION )
 			takeFirst = FALSE;
 		}
 		if ( !takeFirst ) {
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index b53e4172..90bb88e0 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -176,7 +176,7 @@ TQGVector::TQGVector( uint size )			// create vectors with nullptrs
 	return;
     }
     vec = NEW(Item,len);
-    Q_CHECK_PTR( vec );
+    TQ_CHECK_PTR( vec );
     memset( (void*)vec, 0, len*sizeof(Item) );	// fill with nulls
 }
 
@@ -190,11 +190,11 @@ TQGVector::TQGVector( const TQGVector &a )		// make copy of other vector
 	return;
     }
     vec = NEW( Item, len );
-    Q_CHECK_PTR( vec );
+    TQ_CHECK_PTR( vec );
     for ( uint i = 0; i < len; i++ ) {
 	if ( a.vec[i] ) {
 	    vec[i] = newItem( a.vec[i] );
-	    Q_CHECK_PTR( vec[i] );
+	    TQ_CHECK_PTR( vec[i] );
 	} else {
 	    vec[i] = 0;
 	}
@@ -219,11 +219,11 @@ TQGVector& TQGVector::operator=( const TQGVector &v )
 	return *this;
     }
     vec = NEW( Item, len );
-    Q_CHECK_PTR( vec );
+    TQ_CHECK_PTR( vec );
     for ( uint i = 0; i < len; i++ ) {
 	if ( v.vec[i] ) {
 	    vec[i] = newItem( v.vec[i] );
-	    Q_CHECK_PTR( vec[i] );
+	    TQ_CHECK_PTR( vec[i] );
 	} else {
 	    vec[i] = 0;
 	}
@@ -246,7 +246,7 @@ bool TQGVector::insert( uint index, Item d )	// insert item at index
     }
     if ( d ) {
 	vec[index] = newItem( d );
-	Q_CHECK_PTR( vec[index] );
+	TQ_CHECK_PTR( vec[index] );
 	numItems++;
 	return vec[index] != 0;
     } else {
@@ -560,7 +560,7 @@ TQDataStream &TQGVector::read( TQDataStream &s )	// read vector from stream
     for (uint i=0; i to )
-	qSwap( from, to );
+	tqSwap( from, to );
     int m = r.size();
     r.resize( m + 1 );
     r[m].from = from;
@@ -2901,7 +2901,7 @@ int TQRegExpEngine::getToken()
 	    yyMaxRep = getRep( InftyRep );
 	}
 	if ( yyMaxRep < yyMinRep )
-	    qSwap( yyMinRep, yyMaxRep );
+	    tqSwap( yyMinRep, yyMaxRep );
 	if ( yyCh != '}' )
 	    error( RXERR_REPETITION );
 	yyCh = getChar();
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index 9d582d7e..640d5643 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -882,7 +882,7 @@ void TQSettings::removeSearchPath( System s, const TQString &path)
 TQSettings::TQSettings()
 {
     d = new TQSettingsPrivate( Native );
-    Q_CHECK_PTR(d);
+    TQ_CHECK_PTR(d);
 
 #if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     d->sysd = 0;
@@ -902,7 +902,7 @@ TQSettings::TQSettings()
 TQSettings::TQSettings( Format format )
 {
     d = new TQSettingsPrivate( format );
-    Q_CHECK_PTR(d);
+    TQ_CHECK_PTR(d);
 
 #if !defined(TQWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
     d->sysd = 0;
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index f4946a01..756f1247 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -70,13 +70,13 @@
 #endif
 
 #ifndef LLONG_MAX
-#define LLONG_MAX Q_INT64_C(9223372036854775807)
+#define LLONG_MAX TQ_INT64_C(9223372036854775807)
 #endif
 #ifndef LLONG_MIN
-#define LLONG_MIN (-LLONG_MAX - Q_INT64_C(1))
+#define LLONG_MIN (-LLONG_MAX - TQ_INT64_C(1))
 #endif
 #ifndef ULLONG_MAX
-#define ULLONG_MAX Q_UINT64_C(18446744073709551615)
+#define ULLONG_MAX TQ_UINT64_C(18446744073709551615)
 #endif
 
 static int ucstrcmp( const TQString &as, const TQString &bs )
@@ -1855,7 +1855,7 @@ static ArgEscapeData findArgEscapes(const TQString &s)
 	    d.locale_occurrences = 0;
 	}
 
-#if QT_VERSION < 0x040000
+#if TQT_VERSION < 0x040000
     	// ### remove preprocessor in TQt 4.0
 	/* Since in TQt < 4.0 only the first instance is replaced,
 	   escape_len should hold the length of only the first escape
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp
index 9c2d0dfb..e3633600 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/qtextstream.cpp
@@ -399,7 +399,7 @@ bool TQStringBuffer::at( Offset pos )
 Q_LONG TQStringBuffer::readBlock( char *p, Q_ULONG len )
 {
 #if defined(QT_CHECK_STATE)
-    Q_CHECK_PTR( p );
+    TQ_CHECK_PTR( p );
     if ( !isOpen() ) {
 	qWarning( "TQStringBuffer::readBlock: Buffer not open" );
 	return -1;
@@ -1943,7 +1943,7 @@ TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg )
     }
     if ( fwidth ) {				// adjustment required
 	if ( !(flags() & left) ) {		// but NOT left adjustment
-	    len = qstrlen(p);
+	    len = tqstrlen(p);
 	    int padlen = fwidth - len;
 	    if ( padlen <= 0 ) {		// no padding required
 		writeBlock( p, len );
@@ -1959,7 +1959,7 @@ TQTextStream &TQTextStream::output_int( int format, ulong n, bool neg )
 	fwidth = 0;				// reset field width
     }
     else
-	writeBlock( p, qstrlen(p) );
+	writeBlock( p, tqstrlen(p) );
     return *this;
 }
 
@@ -2111,7 +2111,7 @@ TQTextStream &TQTextStream::operator<<( const char* s )
 {
     CHECK_STREAM_PRECOND
     char padbuf[48];
-    uint len = qstrlen( s );			// don't write null terminator
+    uint len = tqstrlen( s );			// don't write null terminator
     if ( fwidth ) {				// field width set
 	int padlen = fwidth - len;
 	fwidth = 0;				// reset width
@@ -2119,7 +2119,7 @@ TQTextStream &TQTextStream::operator<<( const char* s )
 	    char *ppad;
 	    if ( padlen > 46 ) {		// create extra big fill buffer
 		ppad = new char[padlen];
-		Q_CHECK_PTR( ppad );
+		TQ_CHECK_PTR( ppad );
 	    } else {
 		ppad = padbuf;
 	    }
diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h
index 4811d6bf..919ba22e 100644
--- a/src/widgets/ntqaction.h
+++ b/src/widgets/ntqaction.h
@@ -58,7 +58,7 @@ class TQToolTipGroup;
 
 class Q_EXPORT TQAction : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction)
     Q_PROPERTY( bool on READ isOn WRITE setOn )
     Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
@@ -145,7 +145,7 @@ private:
     friend class TQActionGroupPrivate;
     TQActionPrivate* d;
 
-#if defined(Q_DISABLE_COPY)  // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY)  // Disabled copy constructor and operator=
     TQAction( const TQAction & );
     TQAction &operator=( const TQAction & );
 #endif
@@ -153,7 +153,7 @@ private:
 
 class Q_EXPORT TQActionGroup : public TQAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
     Q_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown )
 
@@ -207,7 +207,7 @@ public:
 #endif
 
 private:
-#if defined(Q_DISABLE_COPY)  // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY)  // Disabled copy constructor and operator=
     TQActionGroup( const TQActionGroup & );
     TQActionGroup &operator=( const TQActionGroup & );
 #endif
diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h
index 17dcdd26..ce5f85e4 100644
--- a/src/widgets/ntqbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -55,7 +55,7 @@ class TQButtonData;
 
 class Q_EXPORT TQButton : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ToggleType ToggleState )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
@@ -164,7 +164,7 @@ private:
     void	nextState();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQButton( const TQButton & );
     TQButton &operator=( const TQButton & );
 #endif
diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/ntqbuttongroup.h
index 155c6a76..466e578f 100644
--- a/src/widgets/ntqbuttongroup.h
+++ b/src/widgets/ntqbuttongroup.h
@@ -54,7 +54,7 @@ class TQButtonList;
 
 class Q_EXPORT TQButtonGroup : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive )
     Q_PROPERTY( bool radioButtonExclusive READ isRadioButtonExclusive WRITE setRadioButtonExclusive )
     Q_PROPERTY( int selectedId READ selectedId WRITE setButton )
@@ -109,7 +109,7 @@ private:
     TQButtonList *buttons;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQButtonGroup( const TQButtonGroup & );
     TQButtonGroup &operator=( const TQButtonGroup & );
 #endif
diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/ntqcheckbox.h
index 16a2b7a7..e5110776 100644
--- a/src/widgets/ntqcheckbox.h
+++ b/src/widgets/ntqcheckbox.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQCheckBox : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
     Q_PROPERTY( bool tristate READ isTristate WRITE setTristate )
     Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
@@ -77,7 +77,7 @@ protected:
     void    updateMask();
     bool    hitButton( const TQPoint &pos ) const;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCheckBox( const TQCheckBox & );
     TQCheckBox &operator=( const TQCheckBox & );
 #endif
diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h
index 0b5eb95d..9ab4e3a3 100644
--- a/src/widgets/ntqcombobox.h
+++ b/src/widgets/ntqcombobox.h
@@ -58,7 +58,7 @@ class TQWheelEvent;
 
 class Q_EXPORT TQComboBox : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Policy )
     Q_PROPERTY( bool editable READ editable WRITE setEditable )
     Q_PROPERTY( int count READ count )
@@ -194,7 +194,7 @@ private:
     TQComboBoxData	*d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQComboBox( const TQComboBox & );
     TQComboBox &operator=( const TQComboBox & );
 #endif
diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h
index 86b8db22..e53273f2 100644
--- a/src/widgets/ntqdatetimeedit.h
+++ b/src/widgets/ntqdatetimeedit.h
@@ -51,7 +51,7 @@
 
 class Q_EXPORT TQDateTimeEditBase : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDateTimeEditBase( TQWidget* parent=0, const char* name=0 )
 	: TQWidget( parent, name ) {}
@@ -66,7 +66,7 @@ public slots:
     virtual void stepDown() = 0;
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDateTimeEditBase( const TQDateTimeEditBase & );
     TQDateTimeEditBase &operator=( const TQDateTimeEditBase & );
 #endif
@@ -76,7 +76,7 @@ class TQDateEditPrivate;
 
 class Q_EXPORT TQDateEdit : public TQDateTimeEditBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Order )
     Q_PROPERTY( Order order READ order WRITE setOrder )
     Q_PROPERTY( TQDate date READ date WRITE setDate )
@@ -146,7 +146,7 @@ private:
     TQString sectionText( int sec ) const;
     TQDateEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDateEdit( const TQDateEdit & );
     TQDateEdit &operator=( const TQDateEdit & );
 #endif
@@ -156,7 +156,7 @@ class TQTimeEditPrivate;
 
 class Q_EXPORT TQTimeEdit : public TQDateTimeEditBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_SETS( Display )
     Q_PROPERTY( TQTime time READ time WRITE setTime )
     Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance )
@@ -229,7 +229,7 @@ private:
     TQString sectionText( int sec );
     TQTimeEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTimeEdit( const TQTimeEdit & );
     TQTimeEdit &operator=( const TQTimeEdit & );
 #endif
@@ -240,7 +240,7 @@ class TQDateTimeEditPrivate;
 
 class Q_EXPORT TQDateTimeEdit : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
 
 public:
@@ -283,7 +283,7 @@ private:
     TQTimeEdit* te;
     TQDateTimeEditPrivate* d;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDateTimeEdit( const TQDateTimeEdit & );
     TQDateTimeEdit &operator=( const TQDateTimeEdit & );
 #endif
diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h
index 8fd34772..2fd25d94 100644
--- a/src/widgets/ntqdial.h
+++ b/src/widgets/ntqdial.h
@@ -53,7 +53,7 @@ class TQDialPrivate;
 
 class Q_EXPORT TQDial: public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
     Q_PROPERTY( bool wrapping READ wrapping WRITE setWrapping )
     Q_PROPERTY( int notchSize READ notchSize )
@@ -141,7 +141,7 @@ private:
     void calcLines();
 
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDial( const TQDial & );
     TQDial &operator=( const TQDial & );
 #endif
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index 2c68842d..7ce03c1c 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -62,7 +62,7 @@ class TQDockAreaPrivate;
 
 class Q_EXPORT TQDockAreaLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQDockArea;
 
 public:
@@ -97,7 +97,7 @@ private:
     TQWidget *parentWidget;
     TQValueList lines;
     TQPtrList ls;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQDockAreaLayout( const TQDockAreaLayout & );
     TQDockAreaLayout &operator=( const TQDockAreaLayout & );
 #endif
@@ -105,7 +105,7 @@ private:
 
 class Q_EXPORT TQDockArea : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( HandlePosition )
     Q_PROPERTY( Orientation orientation READ orientation )
     Q_PROPERTY( int count READ count )
@@ -172,7 +172,7 @@ private:
     TQDockAreaPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDockArea( const TQDockArea & );
     TQDockArea& operator=( const TQDockArea & );
 #endif
diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h
index 405a507d..96e417b9 100644
--- a/src/widgets/ntqdockwindow.h
+++ b/src/widgets/ntqdockwindow.h
@@ -64,7 +64,7 @@ class TQWindowsXPStyle;
 
 class Q_EXPORT TQDockWindow : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( CloseMode Place )
     Q_PROPERTY( int closeMode READ closeMode  WRITE setCloseMode ) //### this shouldn't be of type int?!
     Q_PROPERTY( bool resizeEnabled READ isResizeEnabled  WRITE setResizeEnabled )
@@ -219,7 +219,7 @@ private:
     TQDockWindowPrivate *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDockWindow( const TQDockWindow & );
     TQDockWindow& operator=( const TQDockWindow & );
 #endif
diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h
index e157ea1a..21a1cbe4 100644
--- a/src/widgets/ntqframe.h
+++ b/src/widgets/ntqframe.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQFrame : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Shape Shadow )
     Q_PROPERTY( int frameWidth READ frameWidth )
     Q_PROPERTY( TQRect contentsRect READ contentsRect )
@@ -131,7 +131,7 @@ private:
 
     void * d;
 private:        // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQFrame( const TQFrame & );
     TQFrame &operator=( const TQFrame & );
 #endif
diff --git a/src/widgets/ntqgrid.h b/src/widgets/ntqgrid.h
index d28eb6d5..c557fa99 100644
--- a/src/widgets/ntqgrid.h
+++ b/src/widgets/ntqgrid.h
@@ -47,7 +47,7 @@ class TQGridLayout;
 
 class Q_EXPORT TQGrid : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQGrid( int n, TQWidget* parent=0, const char* name=0, WFlags f = 0 );
     TQGrid( int n, Orientation orient, TQWidget* parent=0, const char* name=0,
@@ -66,7 +66,7 @@ protected:
 private:
     TQGridLayout *lay;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGrid( const TQGrid & );
     TQGrid& operator=( const TQGrid & );
 #endif
diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h
index 5e4cd604..e1581689 100644
--- a/src/widgets/ntqgridview.h
+++ b/src/widgets/ntqgridview.h
@@ -51,7 +51,7 @@ class TQGridViewPrivate;
 
 class Q_EXPORT TQGridView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
     Q_PROPERTY( int numCols READ numCols WRITE setNumCols )
     Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth )
@@ -101,7 +101,7 @@ private:
     TQGridViewPrivate* d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGridView( const TQGridView & );
     TQGridView &operator=( const TQGridView & );
 #endif
diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h
index 602788c1..bd4ef354 100644
--- a/src/widgets/ntqgroupbox.h
+++ b/src/widgets/ntqgroupbox.h
@@ -56,7 +56,7 @@ class TQSpacerItem;
 
 class Q_EXPORT TQGroupBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString title READ title WRITE setTitle )
     Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false )
@@ -153,7 +153,7 @@ private:
     int spac, marg;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQGroupBox( const TQGroupBox & );
     TQGroupBox &operator=( const TQGroupBox & );
 #endif
diff --git a/src/widgets/ntqhbox.h b/src/widgets/ntqhbox.h
index 3d46ee30..57fd2ba9 100644
--- a/src/widgets/ntqhbox.h
+++ b/src/widgets/ntqhbox.h
@@ -50,7 +50,7 @@ class TQBoxLayout;
 
 class Q_EXPORT TQHBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHBox( TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
@@ -65,7 +65,7 @@ protected:
 private:
     TQBoxLayout *lay;
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHBox( const TQHBox & );
     TQHBox &operator=( const TQHBox & );
 #endif
diff --git a/src/widgets/ntqhbuttongroup.h b/src/widgets/ntqhbuttongroup.h
index 1f000089..c5f59ffd 100644
--- a/src/widgets/ntqhbuttongroup.h
+++ b/src/widgets/ntqhbuttongroup.h
@@ -49,14 +49,14 @@
 
 class Q_EXPORT TQHButtonGroup : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHButtonGroup( TQWidget* parent=0, const char* name=0 );
     TQHButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 );
     ~TQHButtonGroup();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHButtonGroup( const TQHButtonGroup & );
     TQHButtonGroup &operator=( const TQHButtonGroup & );
 #endif
diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h
index 4ebe46c9..09a2ce35 100644
--- a/src/widgets/ntqheader.h
+++ b/src/widgets/ntqheader.h
@@ -59,7 +59,7 @@ class Q_EXPORT TQHeader : public TQWidget
     friend class TQTableHeader;
     friend class TQListView;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_PROPERTY( bool tracking READ tracking WRITE setTracking )
     Q_PROPERTY( int count READ count )
@@ -197,7 +197,7 @@ private:
     TQHeaderData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHeader( const TQHeader & );
     TQHeader &operator=( const TQHeader & );
 #endif
diff --git a/src/widgets/ntqhgroupbox.h b/src/widgets/ntqhgroupbox.h
index 401432ba..73d33e28 100644
--- a/src/widgets/ntqhgroupbox.h
+++ b/src/widgets/ntqhgroupbox.h
@@ -49,14 +49,14 @@
 
 class Q_EXPORT TQHGroupBox : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQHGroupBox( TQWidget* parent=0, const char* name=0 );
     TQHGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 );
     ~TQHGroupBox();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQHGroupBox( const TQHGroupBox & );
     TQHGroupBox &operator=( const TQHGroupBox & );
 #endif
diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h
index c2d6ca35..5e978931 100644
--- a/src/widgets/ntqlabel.h
+++ b/src/widgets/ntqlabel.h
@@ -52,7 +52,7 @@ class TQLabelPrivate;
 
 class Q_EXPORT TQLabel : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
@@ -162,7 +162,7 @@ private:
     friend class TQTipLabel;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLabel( const TQLabel & );
     TQLabel &operator=( const TQLabel & );
 #endif
diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h
index a936b3e1..01d216ce 100644
--- a/src/widgets/ntqlcdnumber.h
+++ b/src/widgets/ntqlcdnumber.h
@@ -53,7 +53,7 @@ class TQLCDNumberPrivate;
 
 class Q_EXPORT TQLCDNumber : public TQFrame		// LCD number widget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Mode SegmentStyle )
     Q_PROPERTY( bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint )
     Q_PROPERTY( int numDigits READ numDigits WRITE setNumDigits )
@@ -128,7 +128,7 @@ private:
     TQLCDNumberPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLCDNumber( const TQLCDNumber & );
     TQLCDNumber &operator=( const TQLCDNumber & );
 #endif
diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h
index dad904b7..8067cfba 100644
--- a/src/widgets/ntqlineedit.h
+++ b/src/widgets/ntqlineedit.h
@@ -58,7 +58,7 @@ class TQTextCursor;
 
 class Q_EXPORT TQLineEdit : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( EchoMode )
     Q_PROPERTY( TQString text READ text WRITE setText )
     Q_PROPERTY( int maxLength READ maxLength WRITE setMaxLength )
@@ -220,7 +220,7 @@ private:
     TQLineEditPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQLineEdit( const TQLineEdit & );
     TQLineEdit &operator=( const TQLineEdit & );
 #endif
diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h
index a7764791..91cece44 100644
--- a/src/widgets/ntqlistbox.h
+++ b/src/widgets/ntqlistbox.h
@@ -61,7 +61,7 @@ class Q_EXPORT TQListBox : public TQScrollView
     friend class TQListBoxItem;
     friend class TQListBoxPrivate;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode LayoutMode )
     Q_PROPERTY( uint count READ count )
     Q_PROPERTY( int numItemsVisible READ numItemsVisible )
@@ -308,7 +308,7 @@ private:
     static TQListBox * changedListBox;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBox( const TQListBox & );
     TQListBox &operator=( const TQListBox & );
 #endif
@@ -366,7 +366,7 @@ private:
     friend class TQComboBoxPopupItem;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxItem( const TQListBoxItem & );
     TQListBoxItem &operator=( const TQListBoxItem & );
 #endif
@@ -391,7 +391,7 @@ protected:
     void  paint( TQPainter * );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxText( const TQListBoxText & );
     TQListBoxText &operator=( const TQListBoxText & );
 #endif
@@ -423,7 +423,7 @@ protected:
 private:
     TQPixmap pm;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListBoxPixmap( const TQListBoxPixmap & );
     TQListBoxPixmap &operator=( const TQListBoxPixmap & );
 #endif
diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h
index 61efac96..e647152a 100644
--- a/src/widgets/ntqlistview.h
+++ b/src/widgets/ntqlistview.h
@@ -240,7 +240,7 @@ class Q_EXPORT TQListView: public TQScrollView
     friend class TQCheckListItem;
     friend class TQListViewToolTip;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( SelectionMode ResizeMode RenameAction )
     Q_PROPERTY( int columns READ columns )
     Q_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false )
@@ -460,7 +460,7 @@ private:
     TQListViewPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQListView( const TQListView & );
     TQListView &operator=( const TQListView & );
 #endif
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h
index 14ec3b5e..9cd213b9 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -59,7 +59,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQMainWindow: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false )
     Q_PROPERTY( bool usesBigPixmaps READ usesBigPixmaps WRITE setUsesBigPixmaps )
     Q_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel )
@@ -202,7 +202,7 @@ private:
     friend class TQToolBar;
     friend class TQMainWindowLayout;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMainWindow( const TQMainWindow & );
     TQMainWindow& operator=( const TQMainWindow & );
 #endif
diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h
index ae2be8d1..46468d8a 100644
--- a/src/widgets/ntqmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -53,7 +53,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQMenuBar : public TQFrame, public TQMenuData
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Separator )
     Q_PROPERTY( Separator separator READ separator WRITE setSeparator DESIGNABLE false )
     Q_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp )
@@ -193,7 +193,7 @@ private:
 
 private:	// Disabled copy constructor and operator=
 
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuBar( const TQMenuBar & );
     TQMenuBar &operator=( const TQMenuBar & );
 #endif
diff --git a/src/widgets/ntqmenudata.h b/src/widgets/ntqmenudata.h
index fa6d860e..0048c5ba 100644
--- a/src/widgets/ntqmenudata.h
+++ b/src/widgets/ntqmenudata.h
@@ -112,7 +112,7 @@ private:
     TQMenuItemData* extra();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuItem( const TQMenuItem & );
     TQMenuItem &operator=( const TQMenuItem & );
 #endif
@@ -274,7 +274,7 @@ private:
     TQMenuDataData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMenuData( const TQMenuData & );
     TQMenuData &operator=( const TQMenuData & );
 #endif
diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h
index 08b0c951..88d33601 100644
--- a/src/widgets/ntqmultilineedit.h
+++ b/src/widgets/ntqmultilineedit.h
@@ -53,7 +53,7 @@ class TQMultiLineEditData;
 
 class Q_EXPORT TQMultiLineEdit : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int numLines READ numLines )
     Q_PROPERTY( bool atBeginning READ atBeginning )
     Q_PROPERTY( bool atEnd READ atEnd )
@@ -130,7 +130,7 @@ private:
     TQMultiLineEditData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQMultiLineEdit( const TQMultiLineEdit & );
     TQMultiLineEdit &operator=( const TQMultiLineEdit & );
 #endif
diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h
index d3b114b1..af67e914 100644
--- a/src/widgets/ntqpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -51,7 +51,7 @@ class TQPopupMenuPrivate;
 
 class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
 public:
     TQPopupMenu( TQWidget* parent=0, const char* name=0 );
@@ -189,7 +189,7 @@ private:
     void connectModal(TQPopupMenu* receiver, bool doConnect);
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPopupMenu( const TQPopupMenu & );
     TQPopupMenu &operator=( const TQPopupMenu & );
 #endif
diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/ntqprogressbar.h
index b848235c..038ddf83 100644
--- a/src/widgets/ntqprogressbar.h
+++ b/src/widgets/ntqprogressbar.h
@@ -53,7 +53,7 @@ class TQProgressBarPrivate;
 
 class Q_EXPORT TQProgressBar : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps )
     Q_PROPERTY( int progress READ progress WRITE setProgress )
     Q_PROPERTY( TQString progressString READ progressString )
@@ -107,7 +107,7 @@ private:
     void         initFrame();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQProgressBar( const TQProgressBar & );
     TQProgressBar &operator=( const TQProgressBar & );
 #endif
diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/ntqpushbutton.h
index 9f74aae3..e8a317a5 100644
--- a/src/widgets/ntqpushbutton.h
+++ b/src/widgets/ntqpushbutton.h
@@ -52,7 +52,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQPushButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( bool autoDefault READ autoDefault WRITE setAutoDefault )
     Q_PROPERTY( bool default READ isDefault WRITE setDefault )
@@ -137,7 +137,7 @@ private:
     friend class TQDialog;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQPushButton( const TQPushButton & );
     TQPushButton &operator=( const TQPushButton & );
 #endif
diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/ntqradiobutton.h
index 9ceb3078..cfeefa27 100644
--- a/src/widgets/ntqradiobutton.h
+++ b/src/widgets/ntqradiobutton.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQRadioButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool checked READ isChecked WRITE setChecked )
     Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true )
 
@@ -76,7 +76,7 @@ private:
     void    init();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRadioButton( const TQRadioButton & );
     TQRadioButton &operator=( const TQRadioButton & );
 #endif
diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/ntqrangecontrol.h
index 940711cc..7cc2cc3b 100644
--- a/src/widgets/ntqrangecontrol.h
+++ b/src/widgets/ntqrangecontrol.h
@@ -96,7 +96,7 @@ private:
     TQRangeControlPrivate * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRangeControl( const TQRangeControl & );
     TQRangeControl &operator=( const TQRangeControl & );
 #endif
@@ -129,7 +129,7 @@ inline int TQRangeControl::pageStep() const
 class TQSpinWidgetPrivate;
 class Q_EXPORT TQSpinWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSpinWidget( TQWidget* parent=0, const char* name=0 );
     ~TQSpinWidget();
@@ -183,7 +183,7 @@ private:
     void updateDisplay();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSpinWidget( const TQSpinWidget& );
     TQSpinWidget& operator=( const TQSpinWidget& );
 #endif
diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h
index be922901..a14d3ce0 100644
--- a/src/widgets/ntqscrollbar.h
+++ b/src/widgets/ntqscrollbar.h
@@ -52,7 +52,7 @@ class TQTimer;
 
 class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
     Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep )
@@ -159,7 +159,7 @@ private:
     void * d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQScrollBar( const TQScrollBar & );
     TQScrollBar &operator=( const TQScrollBar & );
 #endif
diff --git a/src/widgets/ntqscrollview.h b/src/widgets/ntqscrollview.h
index 2de0e6a5..b2b0869a 100644
--- a/src/widgets/ntqscrollview.h
+++ b/src/widgets/ntqscrollview.h
@@ -51,7 +51,7 @@ class TQScrollViewData;
 
 class Q_EXPORT TQScrollView : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ResizePolicy ScrollBarMode )
     Q_PROPERTY( ResizePolicy resizePolicy READ resizePolicy WRITE setResizePolicy )
     Q_PROPERTY( ScrollBarMode vScrollBarMode READ vScrollBarMode WRITE setVScrollBarMode )
@@ -253,7 +253,7 @@ private slots:
 #endif
 
 private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQScrollView( const TQScrollView & );
     TQScrollView &operator=( const TQScrollView & );
 #endif
diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h
index 2a87d3bf..881e2abb 100644
--- a/src/widgets/ntqslider.h
+++ b/src/widgets/ntqslider.h
@@ -54,7 +54,7 @@ class TQTimer;
 
 class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TickSetting )
     Q_PROPERTY( int minValue READ minValue WRITE setMinValue )
     Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
@@ -168,7 +168,7 @@ private:
     Orientation orient;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSlider( const TQSlider & );
     TQSlider &operator=( const TQSlider & );
 #endif
diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h
index df4a1542..deb0fd50 100644
--- a/src/widgets/ntqspinbox.h
+++ b/src/widgets/ntqspinbox.h
@@ -54,7 +54,7 @@ class TQSpinBoxPrivate;
 
 class Q_EXPORT TQSpinBox: public TQWidget, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( ButtonSymbols )
     Q_PROPERTY( TQString text READ text )
     Q_PROPERTY( TQString prefix READ prefix WRITE setPrefix )
@@ -160,7 +160,7 @@ private:
     void arrangeWidgets();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSpinBox( const TQSpinBox& );
     TQSpinBox& operator=( const TQSpinBox& );
 #endif
diff --git a/src/widgets/ntqsplashscreen.h b/src/widgets/ntqsplashscreen.h
index 10c4e5c6..a369ffc5 100644
--- a/src/widgets/ntqsplashscreen.h
+++ b/src/widgets/ntqsplashscreen.h
@@ -49,7 +49,7 @@ class TQSplashScreenPrivate;
 
 class Q_EXPORT TQSplashScreen : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSplashScreen( const TQPixmap &pixmap = TQPixmap(), WFlags f = 0 );
     virtual ~TQSplashScreen();
diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h
index 8e05120e..1a3742c3 100644
--- a/src/widgets/ntqsplitter.h
+++ b/src/widgets/ntqsplitter.h
@@ -69,7 +69,7 @@ public:
     int handleWidth;
 };
 
-class TQSplitterLayoutStruct : public TQt
+class Q_EXPORT TQSplitterLayoutStruct : public TQt
 {
 public:
     TQCOORD sizer;
@@ -85,7 +85,7 @@ public:
 
 class Q_EXPORT TQSplitter : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize )
     Q_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth )
@@ -179,7 +179,7 @@ public: //private:
     friend class TQTextStream;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSplitter( const TQSplitter & );
     TQSplitter& operator=( const TQSplitter & );
 #endif
@@ -190,9 +190,9 @@ Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& );
 Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& );
 #endif
 
-class TQSplitterHandle : public TQWidget
+class Q_EXPORT TQSplitterHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSplitterHandle( Orientation o,
 		     TQSplitter *parent, const char* name=0 );
diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h
index 1402b2ff..53eb8ad5 100644
--- a/src/widgets/ntqstatusbar.h
+++ b/src/widgets/ntqstatusbar.h
@@ -53,7 +53,7 @@ class TQStatusBarPrivate;
 
 class Q_EXPORT TQStatusBar: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled )
 
 public:
@@ -85,7 +85,7 @@ protected:
 private:
     TQStatusBarPrivate * d;
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQStatusBar( const TQStatusBar & );
     TQStatusBar& operator=( const TQStatusBar & );
 #endif
diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h
index 5428e4c9..2172f8be 100644
--- a/src/widgets/ntqtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -87,7 +87,7 @@ struct TQTabPrivate;
 
 class Q_EXPORT TQTabBar: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( Shape )
     Q_PROPERTY( Shape shape READ shape WRITE setShape )
     Q_PROPERTY( int currentTab READ currentTab WRITE setCurrentTab )
@@ -174,7 +174,7 @@ private:
     friend class TQTab;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabBar( const TQTabBar & );
     TQTabBar& operator=( const TQTabBar & );
 #endif
diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h
index 439eadf0..c599d278 100644
--- a/src/widgets/ntqtabwidget.h
+++ b/src/widgets/ntqtabwidget.h
@@ -56,7 +56,7 @@ class TQWidgetStack;
 
 class Q_EXPORT TQTabWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TabPosition )
     Q_ENUMS( TabShape )
     Q_PROPERTY( TabPosition tabPosition READ tabPosition WRITE setTabPosition )
@@ -151,7 +151,7 @@ private:
     friend class TQTabDialog;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTabWidget( const TQTabWidget & );
     TQTabWidget& operator=( const TQTabWidget & );
 #endif
diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h
index c9a3e5f5..6f3f1bab 100644
--- a/src/widgets/ntqtextbrowser.h
+++ b/src/widgets/ntqtextbrowser.h
@@ -54,7 +54,7 @@ class TQTextBrowserData;
 
 class Q_EXPORT TQTextBrowser : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString source READ source WRITE setSource )
     Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
@@ -96,7 +96,7 @@ private:
     TQTextBrowserData *d;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextBrowser( const TQTextBrowser & );
     TQTextBrowser& operator=( const TQTextBrowser & );
 #endif
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h
index b3e28463..fd3c4e02 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -137,7 +137,7 @@ class Q_EXPORT TQTextEdit : public TQScrollView
     friend class TQTextBrowser;
     friend class TQSyntaxHighlighter;
 
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( WordWrap WrapPolicy )
     Q_SETS( AutoFormatting )
     Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
@@ -458,7 +458,7 @@ protected:
 protected slots:
     virtual void doChangeInterval();
     void sliderReleased(); // ### make virtual in 4.0
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Some functions need to be changed to virtual for TQt 4.0"
 #endif
 
@@ -591,7 +591,7 @@ private:
     bool overWrite : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTextEdit( const TQTextEdit & );
     TQTextEdit &operator=( const TQTextEdit & );
 #endif
diff --git a/src/widgets/ntqtextview.h b/src/widgets/ntqtextview.h
index 71c56856..848c692e 100644
--- a/src/widgets/ntqtextview.h
+++ b/src/widgets/ntqtextview.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQTextView : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false )
     Q_OVERRIDE( bool modified SCRIPTABLE false)
@@ -64,7 +64,7 @@ public:
     virtual ~TQTextView();
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTextView( const TQTextView & );
     TQTextView &operator=( const TQTextView & );
 #endif
diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/ntqtoolbar.h
index f8237f3a..52e6127a 100644
--- a/src/widgets/ntqtoolbar.h
+++ b/src/widgets/ntqtoolbar.h
@@ -54,7 +54,7 @@ class TQToolBarPrivate;
 
 class Q_EXPORT TQToolBar: public TQDockWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString label READ label WRITE setLabel )
 
 public:
@@ -106,7 +106,7 @@ private:
     friend class TQMainWindow;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolBar( const TQToolBar & );
     TQToolBar& operator=( const TQToolBar & );
 #endif
diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/ntqtoolbox.h
index 07e128e1..9ad92aaa 100644
--- a/src/widgets/ntqtoolbox.h
+++ b/src/widgets/ntqtoolbox.h
@@ -53,7 +53,7 @@ class TQWidgetList;
 
 class Q_EXPORT TQToolBox : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex )
     Q_PROPERTY( int count READ count )
 
diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h
index ac2c2df4..e78cf33f 100644
--- a/src/widgets/ntqtoolbutton.h
+++ b/src/widgets/ntqtoolbutton.h
@@ -56,7 +56,7 @@ class TQPopupMenu;
 
 class Q_EXPORT TQToolButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_ENUMS( TextPosition )
 
     Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet )
@@ -149,7 +149,7 @@ protected:
     // ### Make virtual in 4.0, maybe act like TQPushButton with
     // regards to setFlat() instead?  Andy
     bool uses3D() const;
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
 #error "Some functions need to be changed to virtual for TQt 4.0"
 #endif
 
@@ -181,7 +181,7 @@ private:
     uint hasArrow : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolButton( const TQToolButton & );
     TQToolButton& operator=( const TQToolButton & );
 #endif
diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h
index 55b3817b..21cb0c39 100644
--- a/src/widgets/ntqtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -55,7 +55,7 @@ class TQListViewToolTip;
 
 class Q_EXPORT TQToolTipGroup: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool delay READ delay WRITE setDelay )
     Q_PROPERTY( bool enabled READ enabled WRITE setEnabled )
 
@@ -81,7 +81,7 @@ private:
     friend class TQTipManager;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQToolTipGroup( const TQToolTipGroup & );
     TQToolTipGroup& operator=( const TQToolTipGroup & );
 #endif
diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h
index 04902acd..95696343 100644
--- a/src/widgets/ntqvalidator.h
+++ b/src/widgets/ntqvalidator.h
@@ -52,7 +52,7 @@
 
 class Q_EXPORT TQValidator : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQValidator( TQObject * parent, const char *name = 0 );
     ~TQValidator();
@@ -63,7 +63,7 @@ public:
     virtual void fixup( TQString & ) const;
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQValidator( const TQValidator & );
     TQValidator& operator=( const TQValidator & );
 #endif
@@ -72,7 +72,7 @@ private:
 
 class Q_EXPORT TQIntValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int bottom READ bottom WRITE setBottom )
     Q_PROPERTY( int top READ top WRITE setTop )
 
@@ -92,7 +92,7 @@ public:
     int top() const { return t; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQIntValidator( const TQIntValidator & );
     TQIntValidator& operator=( const TQIntValidator & );
 #endif
@@ -104,7 +104,7 @@ private:
 
 class Q_EXPORT TQDoubleValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( double bottom READ bottom WRITE setBottom )
     Q_PROPERTY( double top READ top WRITE setTop )
     Q_PROPERTY( int decimals READ decimals WRITE setDecimals )
@@ -127,7 +127,7 @@ public:
     int decimals() const { return d; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQDoubleValidator( const TQDoubleValidator & );
     TQDoubleValidator& operator=( const TQDoubleValidator & );
 #endif
@@ -139,7 +139,7 @@ private:
 
 class Q_EXPORT TQRegExpValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
     // Q_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp )
 
 public:
@@ -154,7 +154,7 @@ public:
     const TQRegExp& regExp() const { return r; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQRegExpValidator( const TQRegExpValidator& );
     TQRegExpValidator& operator=( const TQRegExpValidator& );
 #endif
diff --git a/src/widgets/ntqvbox.h b/src/widgets/ntqvbox.h
index 740a2811..f5def613 100644
--- a/src/widgets/ntqvbox.h
+++ b/src/widgets/ntqvbox.h
@@ -49,12 +49,12 @@
 
 class Q_EXPORT TQVBox : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVBox( TQWidget* parent=0, const char* name=0, WFlags f=0 );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVBox( const TQVBox & );
     TQVBox& operator=( const TQVBox & );
 #endif
diff --git a/src/widgets/ntqvbuttongroup.h b/src/widgets/ntqvbuttongroup.h
index 41d3c263..332e555f 100644
--- a/src/widgets/ntqvbuttongroup.h
+++ b/src/widgets/ntqvbuttongroup.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQVButtonGroup : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVButtonGroup( TQWidget* parent=0, const char* name=0 );
     TQVButtonGroup( const TQString &title, TQWidget* parent=0, const char* name=0 );
@@ -57,7 +57,7 @@ public:
     ~TQVButtonGroup();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVButtonGroup( const TQVButtonGroup & );
     TQVButtonGroup &operator=( const TQVButtonGroup & );
 #endif
diff --git a/src/widgets/ntqvgroupbox.h b/src/widgets/ntqvgroupbox.h
index f93158af..afa8ae09 100644
--- a/src/widgets/ntqvgroupbox.h
+++ b/src/widgets/ntqvgroupbox.h
@@ -49,7 +49,7 @@
 
 class Q_EXPORT TQVGroupBox : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVGroupBox( TQWidget* parent=0, const char* name=0 );
     TQVGroupBox( const TQString &title, TQWidget* parent=0, const char* name=0 );
@@ -57,7 +57,7 @@ public:
     ~TQVGroupBox();
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQVGroupBox( const TQVGroupBox & );
     TQVGroupBox &operator=( const TQVGroupBox & );
 #endif
diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/ntqwidgetplugin.h
index d53bdd96..6769ada7 100644
--- a/src/widgets/ntqwidgetplugin.h
+++ b/src/widgets/ntqwidgetplugin.h
@@ -63,7 +63,7 @@ class TQWidget;
 
 class Q_EXPORT TQWidgetPlugin : public TQGPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidgetPlugin();
     ~TQWidgetPlugin();
diff --git a/src/widgets/ntqwidgetstack.h b/src/widgets/ntqwidgetstack.h
index bbb4275f..1362ca10 100644
--- a/src/widgets/ntqwidgetstack.h
+++ b/src/widgets/ntqwidgetstack.h
@@ -55,7 +55,7 @@ class TQWidgetStackPrivate;
 
 class Q_EXPORT TQWidgetStack: public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWidgetStack( TQWidget* parent=0, const char* name=0 );
     TQWidgetStack( TQWidget* parent, const char* name, WFlags f);
@@ -101,7 +101,7 @@ private:
     TQWidget * invisible;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidgetStack( const TQWidgetStack & );
     TQWidgetStack& operator=( const TQWidgetStack & );
 #endif
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 54eb894a..d911717c 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -957,7 +957,7 @@ void TQAction::setVisible( bool visible )
 	return;
     d->visible = visible;
     d->update( TQActionPrivate::Visibility );
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQAction::setVisible function wants to be virtual. Also add virtual change() function"
 #endif
     if ( d->d_group ) //### this function wants to be virtual in 4.0
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index a3448680..5445f61f 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -85,7 +85,7 @@ void TQButton::ensureData()
 {
     if ( !d ) {
 	d = new TQButtonData;
-	Q_CHECK_PTR( d );
+	TQ_CHECK_PTR( d );
 	connect(&d->timer, SIGNAL(timeout()), this, SLOT(autoRepeatTimeout()));
     }
 }
@@ -510,7 +510,7 @@ void TQButton::setPixmap( const TQPixmap &pixmap )
     } else {
 	newSize = TRUE;
 	bpixmap = new TQPixmap( pixmap );
-	Q_CHECK_PTR( bpixmap );
+	TQ_CHECK_PTR( bpixmap );
     }
     if ( bpixmap->depth() == 1 && !bpixmap->mask() )
 	bpixmap->setMask( *((TQBitmap *)bpixmap) );
@@ -675,7 +675,7 @@ bool TQButton::hitButton( const TQPoint &pos ) const
 
     \sa drawButtonLabel(), paintEvent()
 */
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "TQButton. Make pure virtual"
 #endif
 void TQButton::drawButton( TQPainter * )
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index 17bcd200..f9022322 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -196,7 +196,7 @@ TQButtonGroup::TQButtonGroup( int strips, Orientation orientation,
 void TQButtonGroup::init()
 {
     buttons = new TQButtonList;
-    Q_CHECK_PTR( buttons );
+    TQ_CHECK_PTR( buttons );
     buttons->setAutoDelete( TRUE );
     excl_grp = FALSE;
     radio_excl = TRUE;
@@ -255,7 +255,7 @@ int TQButtonGroup::insert( TQButton *button, int id )
 
     static int seq_no = -2;
     TQButtonItem *bi = new TQButtonItem;
-    Q_CHECK_PTR( bi );
+    TQ_CHECK_PTR( bi );
 
     if ( id < -1 )
 	bi->id = seq_no--;
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index b4982a16..a4b78c13 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -225,7 +225,7 @@ void TQCheckBox::drawButton( TQPainter *paint )
     int wx = 0, wy = 0;
     if ( use_pm ) {
 	pm = new TQPixmap( irect.size() );	// create new pixmap
-	Q_CHECK_PTR( pm );
+	TQ_CHECK_PTR( pm );
 	pm->fill( cg.background() );
 	TQPainter::redirect(this, pm);
 	pmpaint.begin(this);
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index 6a8d274c..c7fa1d5a 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -380,7 +380,7 @@ private:
 
 class TQDateTimeEditor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQDateTimeEditor( TQDateTimeEditBase * widget, TQWidget *parent,
 		       const char * name=0 );
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h
index f6ecb378..0e7c20d6 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/qdialogbuttons_p.h
@@ -51,7 +51,7 @@ struct TQDialogButtonsPrivate;
 class
 TQDialogButtons : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Button { None=0, Accept=0x01, Reject=0x02, Help=0x04, Apply=0x08, All=0x10, Abort=0x20, Retry=0x40, Ignore=0x80 };
 #ifndef QT_NO_DIALOG
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 867d64a7..875f6d61 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -72,7 +72,7 @@ class TQDockWindowPrivate
 
 class TQDockWindowResizeHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDockWindowResizeHandle( TQt::Orientation o, TQWidget *parent, TQDockWindow *w, const char* /*name*/=0 );
@@ -307,7 +307,7 @@ static TQPoint realWidgetPos( TQDockWindow *w )
 
 class TQDockWindowHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString caption READ caption )
     friend class TQDockWindow;
     friend class TQDockWindowTitleBar;
@@ -357,7 +357,7 @@ private:
 
 class TQDockWindowTitleBar : public TQTitleBar
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class TQDockWindow;
     friend class TQDockWindowHandle;
 
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index 0e5cf784..98939b4c 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -71,7 +71,7 @@ public:
 
 class TQAlphaWidget: public TQWidget, private TQEffects
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQAlphaWidget( TQWidget* w, WFlags f = 0 );
 
@@ -338,7 +338,7 @@ void TQAlphaWidget::alphaBlend()
 
 class TQRollEffect : public TQWidget, private TQEffects
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQRollEffect( TQWidget* w, WFlags f, DirFlags orient );
 
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 18d87f62..173548c3 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -7779,7 +7779,7 @@ void TQListViewItemIterator::addToListView()
     if ( listView ) {
 	if ( !listView->d->iterators ) {
 	    listView->d->iterators = new TQPtrList;
-	    Q_CHECK_PTR( listView->d->iterators );
+	    TQ_CHECK_PTR( listView->d->iterators );
 	}
 	listView->d->iterators->append( this );
     }
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 26a96dbe..72491a25 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -128,7 +128,7 @@ public:
 
 class TQMainWindowLayout : public TQLayout
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQMainWindowLayout( TQMainWindow *mw, TQLayout* parent = 0 );
@@ -299,7 +299,7 @@ public:
 
 class TQHideDock : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQHideDock( TQMainWindow *parent ) : TQWidget( parent, "qt_hide_dock" ) {
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index 96a111b4..d1fde81c 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -908,7 +908,7 @@ int TQMenuBar::calculateRects( int max_width )
 	    irects = 0;
 	} else {
 	    irects = new TQRect[ i ];
-	    Q_CHECK_PTR( irects );
+	    TQ_CHECK_PTR( irects );
 	}
 	max_width = width();
     }
@@ -1545,7 +1545,7 @@ void TQMenuBar::setupAccelerators()
 	    if ( i ) {
 		if ( !autoaccel ) {
 		    autoaccel = new TQAccel( this );
-		    Q_CHECK_PTR( autoaccel );
+		    TQ_CHECK_PTR( autoaccel );
 		    autoaccel->setIgnoreWhatsThis( TRUE );
 		    connect( autoaccel, SIGNAL(activated(int)),
 			     SLOT(accelActivated(int)) );
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp
index 4bacd22f..e40aa0b7 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/qmenudata.cpp
@@ -158,7 +158,7 @@ TQMenuData::TQMenuData()
 {
     actItem = -1;				// no active menu item
     mitems = new TQMenuItemList;			// create list of menu items
-    Q_CHECK_PTR( mitems );
+    TQ_CHECK_PTR( mitems );
     mitems->setAutoDelete( TRUE );
     parentMenu = 0;				// assume top level
     isPopupMenu = FALSE;
@@ -261,7 +261,7 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap,
 	id = get_seq_id();
 
     register TQMenuItem *mi = new TQMenuItem;
-    Q_CHECK_PTR( mi );
+    TQ_CHECK_PTR( mi );
     mi->ident = id;
     if ( widget != 0 ) {
 	mi->widget_item = widget;
@@ -1361,7 +1361,7 @@ bool TQMenuData::setItemParameter( int id, int param ) {
 	return FALSE;
     if ( !mi->signal_data ) {			// create new signal
 	mi->signal_data = new TQSignal;
-	Q_CHECK_PTR( mi->signal_data );
+	TQ_CHECK_PTR( mi->signal_data );
     }
     mi->signal_data->setValue( param );
     return TRUE;
@@ -1403,7 +1403,7 @@ bool TQMenuData::connectItem( int id, const TQObject *receiver,
 	return FALSE;
     if ( !mi->signal_data ) {			// create new signal
 	mi->signal_data = new TQSignal;
-	Q_CHECK_PTR( mi->signal_data );
+	TQ_CHECK_PTR( mi->signal_data );
 	mi->signal_data->setValue( id );
     }
     return mi->signal_data->connect( receiver, member );
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 9c03b031..ed9aa45c 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -502,7 +502,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
 	return;
 #endif
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "Fix this now"
     // #### should move to TQWidget - anything might need this functionality,
     // #### since anything can have WType_Popup window flag.
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index e4c343f9..2d051513 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -230,7 +230,7 @@ void TQRadioButton::drawButton( TQPainter *paint )
     int wx, wy;
     if ( use_pm ) {
 	pm = new TQPixmap( irect.size() );	// create new pixmap
-	Q_CHECK_PTR( pm );
+	TQ_CHECK_PTR( pm );
 	pm->fill(paletteBackgroundColor());
 	TQPainter::redirect(this, pm);
 	pmpaint.begin(this);
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index 484e67da..68dcd700 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -101,7 +101,7 @@ void TQSVChildRec::hideOrShow(TQScrollView* sv, TQWidget* clipped_viewport)
 
 class TQViewportWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQViewportWidget( TQScrollView* parent=0, const char* name=0, WFlags f = 0 )
@@ -110,7 +110,7 @@ public:
 
 class TQClipperWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQClipperWidget( TQWidget * parent=0, const char * name=0, WFlags f=0 )
@@ -2097,7 +2097,7 @@ void TQScrollView::moveContents(int x, int y)
     d->hideOrShowAll(this, TRUE );
 }
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
 #warning "Should rename contents{X,Y,Width,Height} to viewport{...}"
 #endif
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp
index c4419cee..754d39ff 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/qspinbox.cpp
@@ -195,7 +195,7 @@ TQValidator::State TQSpinBoxValidator::validate( TQString& str, int& pos ) const
     \code
 	class MySpinBox : public TQSpinBox
 	{
-	    Q_OBJECT
+	    TQ_OBJECT
 	public:
 	    ...
 
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index 9da69d02..b255aaab 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -338,7 +338,7 @@ void TQTabWidget::addTab( TQWidget *child, TQTab* tab )
 void TQTabWidget::insertTab( TQWidget *child, const TQString &label, int index)
 {
     TQTab * t = new TQTab();
-    Q_CHECK_PTR( t );
+    TQ_CHECK_PTR( t );
     t->label = label;
     insertTab( child, t, index );
 }
@@ -355,7 +355,7 @@ void TQTabWidget::insertTab( TQWidget *child, const TQString &label, int index)
 void TQTabWidget::insertTab( TQWidget *child, const TQIconSet& iconset, const TQString &label, int index )
 {
     TQTab * t = new TQTab();
-    Q_CHECK_PTR( t );
+    TQ_CHECK_PTR( t );
     t->label = label;
     t->iconset = new TQIconSet( iconset );
     insertTab( child, t, index );
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index 561903ab..cb6da79c 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -5014,7 +5014,7 @@ void TQTextEdit::scrollToAnchor( const TQString& name )
     }
 }
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #error "function anchorAt(const TQPoint& pos) should be merged into function anchorAt(const TQPoint& pos, AnchorAttribute attr)"
 #endif
 
@@ -6156,7 +6156,7 @@ bool TQTextEdit::tabChangesFocus() const
 #ifdef QT_TEXTEDIT_OPTIMIZATION
 /* Implementation of optimized LogText mode follows */
 
-static void qSwap( int * a, int * b )
+static void tqSwap( int * a, int * b )
 {
     if ( !a || !b )
 	return;
@@ -6975,8 +6975,8 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy,
 	int selEnd = d->od->selEnd.line;
 	int idxEnd = d->od->selEnd.index;
 	if ( selEnd < selStart ) {
-	    qSwap( &selStart, &selEnd );
-	    qSwap( &idxStart, &idxEnd );
+	    tqSwap( &selStart, &selEnd );
+	    tqSwap( &idxStart, &idxEnd );
 	}
 	if ( selEnd > d->od->numLines-1 ) {
 	    selEnd = d->od->numLines-1;
@@ -7085,11 +7085,11 @@ void TQTextEdit::optimMouseReleaseEvent( TQMouseEvent * e )
 	mousePos = e->pos();
 	d->od->selEnd.index = optimCharIndex( str, mousePos.x() );
 	if ( d->od->selEnd.line < d->od->selStart.line ) {
-	    qSwap( &d->od->selStart.line, &d->od->selEnd.line );
-	    qSwap( &d->od->selStart.index, &d->od->selEnd.index );
+	    tqSwap( &d->od->selStart.line, &d->od->selEnd.line );
+	    tqSwap( &d->od->selStart.index, &d->od->selEnd.index );
 	} else if ( d->od->selStart.line == d->od->selEnd.line &&
 		    d->od->selStart.index > d->od->selEnd.index ) {
-	    qSwap( &d->od->selStart.index, &d->od->selEnd.index );
+	    tqSwap( &d->od->selStart.index, &d->od->selEnd.index );
 	}
 	oldMousePos = e->pos();
 	repaintContents( FALSE );
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index e5031580..bf6e9e81 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -68,7 +68,7 @@ class TQPixmap;
 
 class Q_EXPORT TQTitleBar : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise )
     Q_PROPERTY( bool movable READ isMovable WRITE setMovable )
 
@@ -129,7 +129,7 @@ private:
     void readColors();
 
     TQTitleBarPrivate *d;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQTitleBar( const TQTitleBar & );
     TQTitleBar &operator=( const TQTitleBar & );
 #endif
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index 024ad323..2a48bf62 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -100,7 +100,7 @@ public:
 
 class TQToolBarSeparator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 );
 
@@ -118,7 +118,7 @@ private:
 
 class TQToolBarExtensionWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQToolBarExtensionWidget( TQWidget *w );
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index ace4fd31..5507bfc7 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -61,7 +61,7 @@ static inline TQRect entireWidget()
 
 class TQTipLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTipLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip",
 	     WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM )
@@ -84,7 +84,7 @@ public:
 
 class TQTipManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQTipManager();
    ~TQTipManager();
@@ -150,7 +150,7 @@ static void initTipManager()
 {
     if ( !tipManager ) {
 	tipManager = new TQTipManager;
-	Q_CHECK_PTR( tipManager );
+	TQ_CHECK_PTR( tipManager );
     }
 }
 
@@ -523,7 +523,7 @@ void TQTipManager::showTip()
 	label = new TQTipLabel( TQApplication::desktop()->screen( scr ), t->text);
 	if ( t->geometry != TQRect( -1, -1, -1, -1 ) )
 	    label->resize( t->geometry.size() );
-	Q_CHECK_PTR( label );
+	TQ_CHECK_PTR( label );
 	connect( label, SIGNAL(destroyed()), SLOT(labelDestroyed()) );
     }
     // the above deletion and creation of a TQTipLabel causes events to be sent. We had reports that the widget
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 55d653e9..f1c4fe6a 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -131,7 +131,7 @@
 // a special button
 class TQWhatsThisButton: public TQToolButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQWhatsThisButton( TQWidget * parent, const char * name );
@@ -145,7 +145,7 @@ public slots:
 
 class TQWhatsThat : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, const char* name );
     ~TQWhatsThat() ;
@@ -174,7 +174,7 @@ private:
 
 class TQWhatsThisPrivate: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     // an item for storing texts
diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h
index 395e3d1e..c86ada5d 100644
--- a/src/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/qwidgetresizehandler_p.h
@@ -62,7 +62,7 @@ class TQKeyEvent;
 
 class Q_EXPORT TQWidgetResizeHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum Action {
@@ -126,7 +126,7 @@ private:
     }
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWidgetResizeHandler( const TQWidgetResizeHandler & );
     TQWidgetResizeHandler& operator=( const TQWidgetResizeHandler & );
 #endif
diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp
index 9b80a2fd..d6adf42d 100644
--- a/src/widgets/qwidgetstack.cpp
+++ b/src/widgets/qwidgetstack.cpp
@@ -67,7 +67,7 @@ public:
 };
 
 
-#if (QT_VERSION-0 >= 0x040000)
+#if (TQT_VERSION-0 >= 0x040000)
 #if defined(Q_CC_GNU)
 #warning "Remove TQWidgetStackEventFilter"
 #endif
diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h
index 7a29e975..6d454cce 100644
--- a/src/workspace/ntqworkspace.h
+++ b/src/workspace/ntqworkspace.h
@@ -48,7 +48,7 @@
 
 #ifndef QT_NO_WORKSPACE
 
-#if !defined( QT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE )
+#if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE )
 #define TQM_EXPORT_WORKSPACE
 #else
 #define TQM_EXPORT_WORKSPACE Q_EXPORT
@@ -62,7 +62,7 @@ class TQDockWindow;
 
 class TQM_EXPORT_WORKSPACE TQWorkspace : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled )
 
 #ifdef QT_WORKSPACE_WINDOWMODE
@@ -157,7 +157,7 @@ private:
     friend class TQWorkspaceChild;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQWorkspace( const TQWorkspace & );
     TQWorkspace& operator=( const TQWorkspace & );
 #endif
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index d37f2573..4ec3d57e 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -138,7 +138,7 @@ static bool inCaptionChange = FALSE;
 
 class TQWorkspaceChild : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class TQWorkspace;
     friend class TQTitleBar;
@@ -209,7 +209,7 @@ private:
     bool shademode	    :1;
     bool snappedRight	    :1;
     bool snappedDown	    :1;
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQWorkspaceChild( const TQWorkspaceChild & );
     TQWorkspaceChild &operator=( const TQWorkspaceChild & );
 #endif
diff --git a/src/xml/ntqdom.h b/src/xml/ntqdom.h
index 47d11b18..c35e3958 100644
--- a/src/xml/ntqdom.h
+++ b/src/xml/ntqdom.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
+#if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
 #define TQM_EXPORT_DOM
 #else
 #define TQM_EXPORT_DOM Q_EXPORT
diff --git a/src/xml/ntqxml.h b/src/xml/ntqxml.h
index f69147d2..cc4d2391 100644
--- a/src/xml/ntqxml.h
+++ b/src/xml/ntqxml.h
@@ -49,7 +49,7 @@
 #include "ntqvaluevector.h"
 #endif // QT_H
 
-#if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
+#if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
 #define TQM_EXPORT_XML
 #else
 #define TQM_EXPORT_XML Q_EXPORT
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index dac7ff80..da64aa91 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -1165,7 +1165,7 @@ int TQSvgDevice::lenToInt( const TQDomNamedNodeMap &map, const TQString &attr,
 	bool ok;
 	double dbl = parseLen( map.namedItem( attr ).nodeValue(), &ok );
 	if ( ok )
-	    return qRound( dbl );
+	    return tqRound( dbl );
     }
     return def;
 }
diff --git a/src/xml/qsvgdevice_p.h b/src/xml/qsvgdevice_p.h
index bc717c5c..5b3fe48b 100644
--- a/src/xml/qsvgdevice_p.h
+++ b/src/xml/qsvgdevice_p.h
@@ -59,7 +59,7 @@
 #include "ntqdom.h"
 #endif // QT_H
 
-#if !defined(QT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
+#if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML )
 #define TQM_EXPORT_SVG
 #else
 #define TQM_EXPORT_SVG Q_EXPORT
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index 9a829589..e47e38bd 100644
--- a/tools/assistant/config.cpp
+++ b/tools/assistant/config.cpp
@@ -46,8 +46,8 @@ static Config *static_configuration = 0;
 
 inline TQString getVersionString()
 {
-    return TQString::number( (QT_VERSION >> 16) & 0xff )
-	+ "." + TQString::number( (QT_VERSION >> 8) & 0xff );
+    return TQString::number( (TQT_VERSION >> 16) & 0xff )
+	+ "." + TQString::number( (TQT_VERSION >> 8) & 0xff );
 }
 
 Config::Config()
@@ -193,7 +193,7 @@ void Config::loadDefaultProfile()
 {
     TQSettings settings;
     settings.insertSearchPath( TQSettings::Windows, "/Trolltech" );
-    const TQString key = "/TQt Assistant/" + TQString(QT_VERSION_STR) + "/Profile";
+    const TQString key = "/TQt Assistant/" + TQString(TQT_VERSION_STR) + "/Profile";
     const TQString profKey = key + "/default/";
 
     if( settings.entryList( key + "/default" ).count() == 0 ) {
@@ -242,7 +242,7 @@ void Config::saveProfile( Profile *profile )
     TQSettings settings;
     settings.insertSearchPath( TQSettings::Windows, "/Trolltech" );
     TQString versionString = (profile->props["name"] == "default")
-	? TQString(QT_VERSION_STR)
+	? TQString(TQT_VERSION_STR)
 	: getVersionString();
     const TQString key = "/TQt Assistant/" + versionString + "/";
     const TQString profKey = key + "Profile/" + profile->props["name"] + "/";
diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index 158d10d9..c819b766 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -57,7 +57,7 @@ TQDataStream &operator<<( TQDataStream &s, const ContentItem &ci )
     return s;
 }
 
-const TQString DocuParser::DocumentKey = "/TQt Assistant/" + TQString(QT_VERSION_STR) + "/";
+const TQString DocuParser::DocumentKey = "/TQt Assistant/" + TQString(TQT_VERSION_STR) + "/";
 
 DocuParser *DocuParser::createParser( const TQString &fileName )
 {
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index f299ee8e..c447c4cb 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -288,7 +288,7 @@ void HelpDialog::timerEvent(TQTimerEvent *e)
 {
     static int opacity = 255;
     // To allow patching of 3.2.3 assistant for qsa.
-#if QT_VERSION >= 0x030300
+#if TQT_VERSION >= 0x030300
     help->setWindowOpacity((opacity-=4)/255.0);
     if (opacity<=0)
 #endif
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index 04faa1f5..ecb3bf3e 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -66,7 +66,7 @@ private:
 
 class SearchValidator : public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SearchValidator( TQObject *parent, const char *name = 0 )
 	: TQValidator( parent, name ) {}
@@ -89,7 +89,7 @@ private:
 
 class HelpDialog : public HelpDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HelpDialog( TQWidget *parent, MainWindow *h );
diff --git a/tools/assistant/helpwindow.h b/tools/assistant/helpwindow.h
index db89947d..8ec8f04a 100644
--- a/tools/assistant/helpwindow.h
+++ b/tools/assistant/helpwindow.h
@@ -43,7 +43,7 @@ class TQMouseEvent;
 
 class HelpWindow : public TQTextBrowser
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HelpWindow( MainWindow *m, TQWidget *parent = 0, const char *name = 0 );
     void setSource( const TQString &name );
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 333e41b7..2bd32f20 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -63,7 +63,7 @@ TQDataStream &operator<<( TQDataStream &s, const Document &l );
 
 class Index : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     struct Entry {
 	Entry( int d ) { documents.append( Document( d, 1 ) ); }
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index 28fd6693..a30c72b0 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -41,7 +41,7 @@ class TQProcess;
 
 class TQAssistantClient : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool open READ isOpen )
 
 public:
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index dc99b7a1..64bb8ee9 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -58,7 +58,7 @@ static bool allowFirstRun = TRUE;
 
 class AssistantSocket : public TQSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AssistantSocket( int sock, TQObject *parent = 0 );
     ~AssistantSocket() {}
@@ -74,7 +74,7 @@ private slots:
 
 class AssistantServer : public TQServerSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AssistantServer( TQObject* parent = 0 );
     void newConnection( int socket );
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index a0824271..d257c7cf 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -253,7 +253,7 @@ void MainWindow::about()
 {
     TQMessageBox box( this );
     box.setText( "
    "
-		 "
    Version " + TQString(QT_VERSION_STR) + "
    "
+		 "
    Version " + TQString(TQT_VERSION_STR) + "
    "
 		 "
    Copyright (C) 2000-2008 Trolltech ASA. All rights reserved."
 		 "
    "
 		 "
    TQt Commercial Edition license holders: This program is"
diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h
index 77273dc8..6402dc61 100644
--- a/tools/assistant/settingsdialogimpl.h
+++ b/tools/assistant/settingsdialogimpl.h
@@ -42,7 +42,7 @@
 
 class SettingsDialog : public SettingsDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SettingsDialog( TQWidget *parent, const char* name = 0 );
diff --git a/tools/assistant/topicchooserimpl.h b/tools/assistant/topicchooserimpl.h
index bc3fbd41..11216fa0 100644
--- a/tools/assistant/topicchooserimpl.h
+++ b/tools/assistant/topicchooserimpl.h
@@ -40,7 +40,7 @@
 
 class TopicChooser : public TopicChooserBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     TopicChooser( TQWidget *parent, const TQStringList &lnkNames,
diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index 1f9e8328..def64548 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -138,7 +138,7 @@ void TQDesignerAction::remove()
 
 class TQDesignerIndicatorWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerIndicatorWidget( TQWidget *p )
diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h
index ba21ff5a..41578424 100644
--- a/tools/designer/designer/actiondnd.h
+++ b/tools/designer/designer/actiondnd.h
@@ -52,7 +52,7 @@ class TQPopupMenu;
 
 class ActionDrag : public TQStoredDrag
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ActionDrag(const TQString &type, TQAction *action, TQWidget *source);
@@ -74,7 +74,7 @@ private:
 
 class TQDesignerActionGroup : public TQActionGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerActionGroup( TQObject *parent )
@@ -109,7 +109,7 @@ private:
 
 class TQDesignerAction : public TQAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerAction( TQObject *parent )
@@ -145,7 +145,7 @@ private:
 
 class TQDesignerToolBarSeparator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 );
@@ -164,7 +164,7 @@ private:
 
 class TQSeparatorAction : public TQAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQSeparatorAction( TQObject *parent );
@@ -183,7 +183,7 @@ private:
 
 class TQDesignerToolBar : public TQToolBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerToolBar( TQMainWindow *mw );
diff --git a/tools/designer/designer/actioneditorimpl.h b/tools/designer/designer/actioneditorimpl.h
index a04b2e48..d1279271 100644
--- a/tools/designer/designer/actioneditorimpl.h
+++ b/tools/designer/designer/actioneditorimpl.h
@@ -42,7 +42,7 @@ class ActionItem;
 
 class ActionEditor : public ActionEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/tools/designer/designer/actionlistview.h b/tools/designer/designer/actionlistview.h
index d9663368..59f769ab 100644
--- a/tools/designer/designer/actionlistview.h
+++ b/tools/designer/designer/actionlistview.h
@@ -65,7 +65,7 @@ private:
 
 class ActionListView : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ActionListView( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/asciivalidator.h b/tools/designer/designer/asciivalidator.h
index d3afdfd2..ee6aca39 100644
--- a/tools/designer/designer/asciivalidator.h
+++ b/tools/designer/designer/asciivalidator.h
@@ -40,7 +40,7 @@
 
 class AsciiValidator: public TQValidator
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AsciiValidator( TQObject * parent, const char *name = 0 );
     AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 );
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index d6eef4fe..6fc0aa5c 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -156,7 +156,7 @@ private:
 
 class CommandHistory : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CommandHistory( int s );
diff --git a/tools/designer/designer/connectionitems.h b/tools/designer/designer/connectionitems.h
index 60407ae5..40878c44 100644
--- a/tools/designer/designer/connectionitems.h
+++ b/tools/designer/designer/connectionitems.h
@@ -48,7 +48,7 @@ class ConnectionContainer;
 class ConnectionItem : public TQObject,
 		       public TQComboTableItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConnectionItem( TQTable *table, FormWindow *fw );
@@ -83,7 +83,7 @@ private:
 
 class SenderItem : public ConnectionItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SenderItem( TQTable *table, FormWindow *fw );
@@ -102,7 +102,7 @@ private slots:
 
 class ReceiverItem : public ConnectionItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ReceiverItem( TQTable *table, FormWindow *fw );
@@ -121,7 +121,7 @@ private slots:
 
 class SignalItem : public ConnectionItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SignalItem( TQTable *table, FormWindow *fw );
@@ -138,7 +138,7 @@ signals:
 
 class SlotItem : public ConnectionItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SlotItem( TQTable *table, FormWindow *fw );
@@ -166,7 +166,7 @@ private:
 
 class ConnectionContainer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2,
diff --git a/tools/designer/designer/connectiontable.h b/tools/designer/designer/connectiontable.h
index 6a11ce9f..9e556447 100644
--- a/tools/designer/designer/connectiontable.h
+++ b/tools/designer/designer/connectiontable.h
@@ -38,7 +38,7 @@
 
 class ConnectionTable : public TQTable
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ConnectionTable( TQWidget *parent, const char *name );
diff --git a/tools/designer/designer/customwidgeteditorimpl.h b/tools/designer/designer/customwidgeteditorimpl.h
index fd645976..49f28027 100644
--- a/tools/designer/designer/customwidgeteditorimpl.h
+++ b/tools/designer/designer/customwidgeteditorimpl.h
@@ -46,7 +46,7 @@ class MainWindow;
 
 class CustomWidgetEditor : public CustomWidgetEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CustomWidgetEditor( TQWidget *parent , MainWindow *mw);
diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h
index 3008f783..0af7a92f 100644
--- a/tools/designer/designer/database.h
+++ b/tools/designer/designer/database.h
@@ -65,7 +65,7 @@ protected:
 
 class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerDataBrowser( TQWidget *parent, const char *name );
@@ -76,7 +76,7 @@ protected:
 
 class TQDesignerDataView : public TQDataView, public DatabaseSupport
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerDataView( TQWidget *parent, const char *name );
diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h
index fade3b8e..df7c294b 100644
--- a/tools/designer/designer/database2.h
+++ b/tools/designer/designer/database2.h
@@ -65,7 +65,7 @@ protected:
 
 class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerDataBrowser2( TQWidget *parent, const char *name );
@@ -76,7 +76,7 @@ protected:
 
 class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerDataView2( TQWidget *parent, const char *name );
diff --git a/tools/designer/designer/dbconnectionimpl.h b/tools/designer/designer/dbconnectionimpl.h
index c3c7b7f9..fbf379d3 100644
--- a/tools/designer/designer/dbconnectionimpl.h
+++ b/tools/designer/designer/dbconnectionimpl.h
@@ -42,7 +42,7 @@ class TQGridLayout;
 
 class DatabaseConnectionEditor : public DatabaseConnectionEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0,
diff --git a/tools/designer/designer/dbconnectionsimpl.h b/tools/designer/designer/dbconnectionsimpl.h
index ef3e50bd..3b65ed60 100644
--- a/tools/designer/designer/dbconnectionsimpl.h
+++ b/tools/designer/designer/dbconnectionsimpl.h
@@ -41,7 +41,7 @@ class Project;
 
 class DatabaseConnectionsEditor : public DatabaseConnectionBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0,
diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp
index 06e8edab..f3347446 100644
--- a/tools/designer/designer/designerapp.cpp
+++ b/tools/designer/designer/designerapp.cpp
@@ -105,16 +105,16 @@ TQString DesignerApplication::settingsKey()
 {
     if ( !settings_key )
 	settings_key = new TQString( "/TQt Designer/" +
-				    TQString::number( (QT_VERSION >> 16) & 0xff ) +
-	                            "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+				    TQString::number( (TQT_VERSION >> 16) & 0xff ) +
+	                            "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" );
     return *settings_key;
 }
 
 TQString DesignerApplication::oldSettingsKey()
 {
     if ( !old_settings_key ) {
-	int majorVer = (QT_VERSION >> 16) & 0xff;
-	int minorVer = (QT_VERSION >> 8) & 0xff;
+	int majorVer = (TQT_VERSION >> 16) & 0xff;
+	int minorVer = (TQT_VERSION >> 8) & 0xff;
 	
 	// If minorVer is 0 (e.g. 4.0) then we don't want to read the
 	// old settings, too much might have changed.
diff --git a/tools/designer/designer/editfunctionsimpl.h b/tools/designer/designer/editfunctionsimpl.h
index d852afcf..e661dedd 100644
--- a/tools/designer/designer/editfunctionsimpl.h
+++ b/tools/designer/designer/editfunctionsimpl.h
@@ -44,7 +44,7 @@ class TQListViewItem;
 
 class EditFunctions : public EditFunctionsBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE );
diff --git a/tools/designer/designer/formfile.h b/tools/designer/designer/formfile.h
index 8cc493c3..d0dbe537 100644
--- a/tools/designer/designer/formfile.h
+++ b/tools/designer/designer/formfile.h
@@ -44,7 +44,7 @@ class SourceEditor;
 
 class FormFile : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class SourceEditor;
 
 public:
diff --git a/tools/designer/designer/formsettingsimpl.h b/tools/designer/designer/formsettingsimpl.h
index 950b2f21..4b797390 100644
--- a/tools/designer/designer/formsettingsimpl.h
+++ b/tools/designer/designer/formsettingsimpl.h
@@ -40,7 +40,7 @@ class FormWindow;
 
 class FormSettings : public FormSettingsBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FormSettings( TQWidget *parent, FormWindow *fw );
diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h
index b294d679..130d719a 100644
--- a/tools/designer/designer/formwindow.h
+++ b/tools/designer/designer/formwindow.h
@@ -71,7 +71,7 @@ class OrderIndicator;
 
 class FormWindow : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h
index 29c20055..faa097e0 100644
--- a/tools/designer/designer/hierarchyview.h
+++ b/tools/designer/designer/hierarchyview.h
@@ -104,7 +104,7 @@ private:
 
 class HierarchyList : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE );
@@ -156,7 +156,7 @@ protected:
 
 class FormDefinitionView : public HierarchyList
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FormDefinitionView( TQWidget *parent, FormWindow *fw );
@@ -189,7 +189,7 @@ private:
 
 class HierarchyView : public TQTabWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     HierarchyView( TQWidget *parent );
diff --git a/tools/designer/designer/iconvieweditorimpl.h b/tools/designer/designer/iconvieweditorimpl.h
index dc995147..d9e04a9a 100644
--- a/tools/designer/designer/iconvieweditorimpl.h
+++ b/tools/designer/designer/iconvieweditorimpl.h
@@ -40,7 +40,7 @@ class FormWindow;
 
 class IconViewEditor : public IconViewEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 97bd997b..85b5b6af 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -47,7 +47,7 @@ class TQPaintEvent;
 
 class Layout : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
@@ -124,7 +124,7 @@ protected:
 
 class Spacer : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_OVERRIDE( TQCString name )
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
@@ -168,7 +168,7 @@ protected:
 
 class TQDesignerGridLayout : public TQGridLayout
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
     TQDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){};
     TQDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
diff --git a/tools/designer/designer/listboxdnd.h b/tools/designer/designer/listboxdnd.h
index 50e8db89..546f6a2a 100644
--- a/tools/designer/designer/listboxdnd.h
+++ b/tools/designer/designer/listboxdnd.h
@@ -42,7 +42,7 @@ typedef TQPtrList ListBoxItemList;
 
 class ListBoxDnd : public ListDnd
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     // dragModes are enumerated in ListDnd
     ListBoxDnd( TQListBox * eventSource, const char * name = 0 );
diff --git a/tools/designer/designer/listboxeditorimpl.h b/tools/designer/designer/listboxeditorimpl.h
index d4375fb8..2f84eaf9 100644
--- a/tools/designer/designer/listboxeditorimpl.h
+++ b/tools/designer/designer/listboxeditorimpl.h
@@ -41,7 +41,7 @@ class FormWindow;
 
 class ListBoxEditor : public ListBoxEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
diff --git a/tools/designer/designer/listboxrename.h b/tools/designer/designer/listboxrename.h
index e857fcfe..8606dea4 100644
--- a/tools/designer/designer/listboxrename.h
+++ b/tools/designer/designer/listboxrename.h
@@ -41,7 +41,7 @@ class TQLineEdit;
 
 class ListBoxRename : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ListBoxRename( TQListBox * eventSource, const char * name = 0 );
     bool eventFilter( TQObject *, TQEvent * event );
diff --git a/tools/designer/designer/listdnd.h b/tools/designer/designer/listdnd.h
index 08820f70..df93f5cc 100644
--- a/tools/designer/designer/listdnd.h
+++ b/tools/designer/designer/listdnd.h
@@ -39,7 +39,7 @@
 
 class ListDnd : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum DragMode { None = 0, External = 1, Internal = 2, Both = 3, Move = 4, NullDrop = 8 };
     ListDnd( TQScrollView * eventSource, const char * name = 0 );
diff --git a/tools/designer/designer/listviewdnd.h b/tools/designer/designer/listviewdnd.h
index dee4ce43..a58773d7 100644
--- a/tools/designer/designer/listviewdnd.h
+++ b/tools/designer/designer/listviewdnd.h
@@ -44,7 +44,7 @@ typedef TQPtrList ListViewItemList;
 
 class ListViewDnd : public ListDnd
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum DragMode { Flat = 16 }; // see ListDnd::DragMode
 
diff --git a/tools/designer/designer/listvieweditorimpl.h b/tools/designer/designer/listvieweditorimpl.h
index f3258fb6..194e1f81 100644
--- a/tools/designer/designer/listvieweditorimpl.h
+++ b/tools/designer/designer/listvieweditorimpl.h
@@ -44,7 +44,7 @@ class FormWindow;
 
 class ListViewEditor : public ListViewEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw );
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 822f35eb..4f22fb8b 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -820,7 +820,7 @@ void MainWindow::helpAbout()
 	LanguageInterface *iface = MetaDataBase::languageInterface( eProject->language() );
 	dlg.aboutLicense->setText( iface->aboutText() );
     }
-    dlg.aboutVersion->setText(TQString("Version ") + TQString(QT_VERSION_STR));
+    dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR));
     dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) );
     dlg.exec();
 }
@@ -1306,7 +1306,7 @@ void MainWindow::insertFormWindow( FormWindow *fw )
     }
     fw->show();
     fw->currentToolChanged();
-    if ( fw->caption().isEmpty() && qstrlen( fw->name() )  )
+    if ( fw->caption().isEmpty() && tqstrlen( fw->name() )  )
 	fw->setCaption( fw->name() );
     fw->mainContainer()->setCaption( fw->caption() );
     WidgetFactory::saveDefaultProperties( fw->mainContainer(),
diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h
index 602f8a56..b18618a9 100644
--- a/tools/designer/designer/mainwindow.h
+++ b/tools/designer/designer/mainwindow.h
@@ -83,7 +83,7 @@ class Preferences;
 
 class MainWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum LineMode { Error, Step, StackFrame };
@@ -481,7 +481,7 @@ public:
 
 class SenderObject : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SenderObject( TQUnknownInterface *i ) : iface( i ) { iface->addRef(); }
diff --git a/tools/designer/designer/menubareditor.h b/tools/designer/designer/menubareditor.h
index 495d4112..f1d87f20 100644
--- a/tools/designer/designer/menubareditor.h
+++ b/tools/designer/designer/menubareditor.h
@@ -43,7 +43,7 @@ class TQActionGroup;
 
 class MenuBarEditorItem : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class MenuBarEditor;
 
@@ -87,7 +87,7 @@ class FormWindow;
 
 class MenuBarEditor : public TQMenuBar
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
diff --git a/tools/designer/designer/multilineeditorimpl.h b/tools/designer/designer/multilineeditorimpl.h
index 603578db..11c7233c 100644
--- a/tools/designer/designer/multilineeditorimpl.h
+++ b/tools/designer/designer/multilineeditorimpl.h
@@ -45,7 +45,7 @@ class TQTextDocument;
 
 class TextEdit : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TextEdit( TQWidget *parent = 0, const char *name = 0 );
@@ -56,7 +56,7 @@ public:
 
 class ToolBarItem : public TQAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ToolBarItem( TQWidget *parent, TQWidget *toolBar,
@@ -75,7 +75,7 @@ private:
 
 class MultiLineEditor : public MultiLineEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
diff --git a/tools/designer/designer/newformimpl.h b/tools/designer/designer/newformimpl.h
index ba9a21c8..3b941338 100644
--- a/tools/designer/designer/newformimpl.h
+++ b/tools/designer/designer/newformimpl.h
@@ -149,7 +149,7 @@ private:
 
 class NewForm : public NewFormBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     NewForm( TQIconView *templateView, const TQString &templatePath );
diff --git a/tools/designer/designer/orderindicator.h b/tools/designer/designer/orderindicator.h
index 49b144f6..1e7c8882 100644
--- a/tools/designer/designer/orderindicator.h
+++ b/tools/designer/designer/orderindicator.h
@@ -40,7 +40,7 @@ class FormWindow;
 
 class OrderIndicator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     OrderIndicator( int i, TQWidget* w, FormWindow* fw );
diff --git a/tools/designer/designer/outputwindow.h b/tools/designer/designer/outputwindow.h
index 991e7572..a523793b 100644
--- a/tools/designer/designer/outputwindow.h
+++ b/tools/designer/designer/outputwindow.h
@@ -68,7 +68,7 @@ private:
 
 class OutputWindow : public TQTabWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     OutputWindow( TQWidget *parent );
diff --git a/tools/designer/designer/paletteeditoradvancedimpl.h b/tools/designer/designer/paletteeditoradvancedimpl.h
index 3abd0fc1..ab61b33e 100644
--- a/tools/designer/designer/paletteeditoradvancedimpl.h
+++ b/tools/designer/designer/paletteeditoradvancedimpl.h
@@ -40,7 +40,7 @@ class FormWindow;
 
 class PaletteEditorAdvanced : public PaletteEditorAdvancedBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0,
 			   bool modal=FALSE, WFlags f=0 );
diff --git a/tools/designer/designer/paletteeditorimpl.h b/tools/designer/designer/paletteeditorimpl.h
index a4cd675a..8ae59843 100644
--- a/tools/designer/designer/paletteeditorimpl.h
+++ b/tools/designer/designer/paletteeditorimpl.h
@@ -40,7 +40,7 @@ class FormWindow;
 
 class PaletteEditor : public PaletteEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
diff --git a/tools/designer/designer/pixmapchooser.h b/tools/designer/designer/pixmapchooser.h
index 4ac0cba5..22050216 100644
--- a/tools/designer/designer/pixmapchooser.h
+++ b/tools/designer/designer/pixmapchooser.h
@@ -44,7 +44,7 @@ class FormWindow;
 class PixmapView : public TQScrollView,
 		   public TQFilePreview
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PixmapView( TQWidget *parent );
@@ -59,7 +59,7 @@ private:
 
 class ImageIconProvider : public TQFileIconProvider
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ImageIconProvider( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/popupmenueditor.h b/tools/designer/designer/popupmenueditor.h
index b4335905..8143b9fa 100644
--- a/tools/designer/designer/popupmenueditor.h
+++ b/tools/designer/designer/popupmenueditor.h
@@ -43,7 +43,7 @@ class TQMenuItem;
 
 class PopupMenuEditorItem : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class PopupMenuEditor;
 
@@ -106,7 +106,7 @@ class TQLineEdit;
 
 class PopupMenuEditor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class PopupMenuEditorItem;
     friend class MenuBarEditor;
diff --git a/tools/designer/designer/previewframe.h b/tools/designer/designer/previewframe.h
index 679f2081..67fabbf5 100644
--- a/tools/designer/designer/previewframe.h
+++ b/tools/designer/designer/previewframe.h
@@ -41,7 +41,7 @@
 
 class PreviewWorkspace : public TQWorkspace
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 )
         : TQWorkspace( parent, name ) {}
@@ -53,7 +53,7 @@ protected:
 
 class PreviewFrame : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PreviewFrame( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/previewwidgetimpl.h b/tools/designer/designer/previewwidgetimpl.h
index 0fff9d15..aaf51154 100644
--- a/tools/designer/designer/previewwidgetimpl.h
+++ b/tools/designer/designer/previewwidgetimpl.h
@@ -38,7 +38,7 @@
 
 class PreviewWidget : public PreviewWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PreviewWidget( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index 066712c1..810e5b00 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -117,7 +117,7 @@ private:
 
 class Project : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     friend class DatabaseConnection;
 
 public:
diff --git a/tools/designer/designer/projectsettingsimpl.h b/tools/designer/designer/projectsettingsimpl.h
index cff46e91..639dab14 100644
--- a/tools/designer/designer/projectsettingsimpl.h
+++ b/tools/designer/designer/projectsettingsimpl.h
@@ -43,7 +43,7 @@ class SourceFile;
 
 class ProjectSettings : public ProjectSettingsBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index ca7228ac..45f22481 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -145,7 +145,7 @@ private:
 class PropertyTextItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -181,7 +181,7 @@ private:
 class PropertyBoolItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -205,7 +205,7 @@ private:
 class PropertyIntItem : public TQObject,
 			public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyIntItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -230,7 +230,7 @@ private:
 class PropertyLayoutItem : public TQObject,
 			public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyLayoutItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -254,7 +254,7 @@ private:
 class PropertyDoubleItem : public TQObject,
 			public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyDoubleItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -277,7 +277,7 @@ private:
 class PropertyListItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyListItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -312,7 +312,7 @@ private:
 class PropertyFontItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -341,7 +341,7 @@ private:
 class PropertyCoordItem : public TQObject,
 			  public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum Type { Rect, Size, Point };
@@ -370,7 +370,7 @@ private:
 class PropertyColorItem : public TQObject,
 			  public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -404,7 +404,7 @@ private:
 class PropertyPixmapItem : public TQObject,
 			   public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum Type { Pixmap, IconSet, Image };
@@ -436,7 +436,7 @@ private:
 class PropertySizePolicyItem : public TQObject,
 			  public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertySizePolicyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -462,7 +462,7 @@ private:
 class PropertyPaletteItem : public TQObject,
 			    public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyPaletteItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -490,7 +490,7 @@ private:
 class PropertyCursorItem : public TQObject,
 			   public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyCursorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -514,7 +514,7 @@ private:
 class PropertyKeysequenceItem : public TQObject,
 				public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyKeysequenceItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -544,7 +544,7 @@ private:
 class PropertyDatabaseItem : public TQObject,
 			     public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName, bool wField );
@@ -581,7 +581,7 @@ struct EnumItem {
 
 class EnumPopup : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     EnumPopup( TQWidget *parent, const char *name, WFlags f=0 );
@@ -605,7 +605,7 @@ private:
 
 class EnumBox : public TQComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     EnumBox( TQWidget *parent, const char *name = 0 );
@@ -639,7 +639,7 @@ private:
 class PropertyEnumItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyEnumItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -665,7 +665,7 @@ private:
 
 class PropertyList : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyList( PropertyEditor *e );
@@ -727,7 +727,7 @@ private:
 
 class EventList : public HierarchyList
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e );
@@ -754,7 +754,7 @@ private:
 
 class PropertyEditor : public TQTabWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyEditor( TQWidget *parent );
@@ -805,7 +805,7 @@ private:
 class PropertyDateItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -828,7 +828,7 @@ private:
 class PropertyTimeItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -851,7 +851,7 @@ private:
 class PropertyDateTimeItem : public TQObject,
 			 public PropertyItem
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/qcompletionedit.h
index 7bae93b8..fcc8b4ae 100644
--- a/tools/designer/designer/qcompletionedit.h
+++ b/tools/designer/designer/qcompletionedit.h
@@ -42,7 +42,7 @@ class TQVBox;
 
 class TQCompletionEdit : public TQLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
     Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
 
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 0e4a5206..4f6c997d 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -2429,13 +2429,13 @@ static TQImage loadImageData( TQDomElement &n2 )
 	ulong len = n2.attribute( "length" ).toULong();
 	if ( len < data.length() * 5 )
 	    len = data.length() * 5;
-	// qUncompress() expects the first 4 bytes to be the expected length of
+	// tqUncompress() expects the first 4 bytes to be the expected length of
 	// the uncompressed data
 	ba[0] = ( len & 0xff000000 ) >> 24;
 	ba[1] = ( len & 0x00ff0000 ) >> 16;
 	ba[2] = ( len & 0x0000ff00 ) >> 8;
 	ba[3] = ( len & 0x000000ff );
-	TQByteArray baunzip = qUncompress( ba, baSize );
+	TQByteArray baunzip = tqUncompress( ba, baSize );
 	img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) );
     }  else {
 	img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format );
diff --git a/tools/designer/designer/sizehandle.h b/tools/designer/designer/sizehandle.h
index d391ec9a..adc1d781 100644
--- a/tools/designer/designer/sizehandle.h
+++ b/tools/designer/designer/sizehandle.h
@@ -45,7 +45,7 @@ class TQPaintEvent;
 
 class SizeHandle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left };
diff --git a/tools/designer/designer/sourceeditor.h b/tools/designer/designer/sourceeditor.h
index a41fd86c..613fb549 100644
--- a/tools/designer/designer/sourceeditor.h
+++ b/tools/designer/designer/sourceeditor.h
@@ -46,7 +46,7 @@ class SourceFile;
 
 class SourceEditor : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface );
diff --git a/tools/designer/designer/sourcefile.h b/tools/designer/designer/sourcefile.h
index 47663c8e..b659efaa 100644
--- a/tools/designer/designer/sourcefile.h
+++ b/tools/designer/designer/sourcefile.h
@@ -43,7 +43,7 @@ class Project;
 
 class SourceFile : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SourceFile( const TQString &fn, bool temp, Project *p );
diff --git a/tools/designer/designer/startdialogimpl.h b/tools/designer/designer/startdialogimpl.h
index c9406dc1..21d0b1df 100644
--- a/tools/designer/designer/startdialogimpl.h
+++ b/tools/designer/designer/startdialogimpl.h
@@ -46,7 +46,7 @@
 
 class FileDialog : public TQFileDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     FileDialog( const TQString &dir, TQWidget *parent );
@@ -61,7 +61,7 @@ signals:
 
 class StartDialog : public StartDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     StartDialog( TQWidget *parent, const TQString &templatePath );
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index 4574bf42..e9639d03 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -43,7 +43,7 @@ class FormWindow;
 
 class StyledButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( TQColor color READ color WRITE setColor )
     Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
diff --git a/tools/designer/designer/tableeditorimpl.h b/tools/designer/designer/tableeditorimpl.h
index bb688433..f566f264 100644
--- a/tools/designer/designer/tableeditorimpl.h
+++ b/tools/designer/designer/tableeditorimpl.h
@@ -43,7 +43,7 @@ class FormWindow;
 
 class TableEditor : public TableEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0,
diff --git a/tools/designer/designer/timestamp.h b/tools/designer/designer/timestamp.h
index b37d57f1..bdb88d80 100644
--- a/tools/designer/designer/timestamp.h
+++ b/tools/designer/designer/timestamp.h
@@ -40,7 +40,7 @@
 
 class TimeStamp : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TimeStamp( TQObject *parent, const TQString &f );
diff --git a/tools/designer/designer/variabledialogimpl.h b/tools/designer/designer/variabledialogimpl.h
index af4564b2..adc6f964 100644
--- a/tools/designer/designer/variabledialogimpl.h
+++ b/tools/designer/designer/variabledialogimpl.h
@@ -41,7 +41,7 @@ class TQListView;
 
 class VariableDialog : public VariableDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     VariableDialog( FormWindow *fw, TQWidget* parent = 0 );
     ~VariableDialog();
diff --git a/tools/designer/designer/widgetaction.h b/tools/designer/designer/widgetaction.h
index da500176..40017de8 100644
--- a/tools/designer/designer/widgetaction.h
+++ b/tools/designer/designer/widgetaction.h
@@ -38,7 +38,7 @@
 
 class WidgetAction : public TQAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     WidgetAction( const TQString &grp, TQObject* parent,
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 59e05a99..55d22907 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -128,7 +128,7 @@ private:
 
 class TQDesignerTabWidget : public TQTabWidget
 {
-    Q_OBJECT
+    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 )
@@ -157,7 +157,7 @@ private:
 
 class TQDesignerWidgetStack : public TQWidgetStack
 {
-    Q_OBJECT
+    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 )
 public:
@@ -200,7 +200,7 @@ private:
 
 class TQDesignerWizard : public TQWizard
 {
-    Q_OBJECT
+    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 )
@@ -242,7 +242,7 @@ private:
 
 class TQLayoutWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {}
@@ -260,7 +260,7 @@ protected:
 
 class CustomWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
@@ -292,7 +292,7 @@ protected:
 
 class Line : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     Q_OVERRIDE( int frameWidth DESIGNABLE false )
@@ -318,7 +318,7 @@ public:
 
 class TQDesignerLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
 
@@ -350,7 +350,7 @@ private:
 
 class TQDesignerWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name )
@@ -370,7 +370,7 @@ private:
 
 class TQDesignerDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
@@ -391,7 +391,7 @@ private:
 
 class TQDesignerToolButton : public TQToolButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
@@ -414,7 +414,7 @@ public:
 
 class TQDesignerRadioButton : public TQRadioButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
@@ -439,7 +439,7 @@ public:
 
 class TQDesignerPushButton : public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
@@ -463,7 +463,7 @@ public:
 
 class TQDesignerCheckBox : public TQCheckBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
@@ -487,7 +487,7 @@ public:
 
 class TQDesignerToolBox : public TQToolBox
 {
-    Q_OBJECT
+    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 )
diff --git a/tools/designer/designer/wizardeditorimpl.h b/tools/designer/designer/wizardeditorimpl.h
index 983e26a8..c8326893 100644
--- a/tools/designer/designer/wizardeditorimpl.h
+++ b/tools/designer/designer/wizardeditorimpl.h
@@ -44,7 +44,7 @@ class FormWindow;
 
 class WizardEditor : public WizardEditorBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw );
diff --git a/tools/designer/designer/workspace.h b/tools/designer/designer/workspace.h
index e99c6f40..4f5bea13 100644
--- a/tools/designer/designer/workspace.h
+++ b/tools/designer/designer/workspace.h
@@ -93,7 +93,7 @@ private:
 
 class Workspace : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Workspace( TQWidget *parent , MainWindow *mw );
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index e16708d0..c49066c0 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -128,7 +128,7 @@ static const char * right_disabled_xpm[] = {
 
 class ArrowButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum Dir { Left, Right };
diff --git a/tools/designer/editor/arghintwidget.h b/tools/designer/editor/arghintwidget.h
index 09937e3d..5de4a129 100644
--- a/tools/designer/editor/arghintwidget.h
+++ b/tools/designer/editor/arghintwidget.h
@@ -41,7 +41,7 @@ class ArrowButton;
 
 class ArgHintWidget : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ArgHintWidget( TQWidget *parent, const char*name );
diff --git a/tools/designer/editor/browser.h b/tools/designer/editor/browser.h
index a19e2bcc..ac8ada28 100644
--- a/tools/designer/editor/browser.h
+++ b/tools/designer/editor/browser.h
@@ -43,7 +43,7 @@ class TQTextFormat;
 
 class EditorBrowser : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     EditorBrowser( Editor *e );
diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h
index 6328315c..cb46fed8 100644
--- a/tools/designer/editor/completion.h
+++ b/tools/designer/editor/completion.h
@@ -64,7 +64,7 @@ struct CompletionEntry
 
 class EditorCompletion : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     EditorCompletion( Editor *e );
diff --git a/tools/designer/editor/editor.h b/tools/designer/editor/editor.h
index 768c5f53..06039431 100644
--- a/tools/designer/editor/editor.h
+++ b/tools/designer/editor/editor.h
@@ -44,7 +44,7 @@ class TQAccel;
 
 class Editor : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum Selection {
diff --git a/tools/designer/editor/markerwidget.h b/tools/designer/editor/markerwidget.h
index 2ab70a42..67e4e3bc 100644
--- a/tools/designer/editor/markerwidget.h
+++ b/tools/designer/editor/markerwidget.h
@@ -42,7 +42,7 @@ class TQTextParagraph;
 
 class MarkerWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MarkerWidget( ViewManager *parent, const char*name );
diff --git a/tools/designer/editor/viewmanager.h b/tools/designer/editor/viewmanager.h
index 46e4839d..ea8addc5 100644
--- a/tools/designer/editor/viewmanager.h
+++ b/tools/designer/editor/viewmanager.h
@@ -47,7 +47,7 @@ class TQTimer;
 
 class ViewManager : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ViewManager( TQWidget *parent, const char *name );
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index f0014d37..11adb7f9 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -72,7 +72,7 @@
 
 #include 
 
-/* qmake ignore Q_OBJECT */
+/* qmake ignore TQ_OBJECT */
 
 /*
   The indenter avoids getting stuck in almost infinite loops by
@@ -629,9 +629,9 @@ static bool isUnfinishedLine()
     if ( TQString("{};").find(lastCh) == -1 && !yyLine->endsWith("...") ) {
 	/*
 	  It doesn't end with ';' or similar. If it's neither
-	  "Q_OBJECT" nor "if ( x )", it must be an unfinished line.
+	  "TQ_OBJECT" nor "if ( x )", it must be an unfinished line.
 	*/
-	unf = ( yyLine->contains("Q_OBJECT") == 0 &&
+	unf = ( yyLine->contains("TQ_OBJECT") == 0 &&
 		!matchBracelessControlStatement() );
     } else if ( lastCh == TQChar(';') ) {
 	if ( lastParen(*yyLine) == TQChar('(') ) {
diff --git a/tools/designer/examples/credit/creditform.h b/tools/designer/examples/credit/creditform.h
index 5bd2778e..f8beb358 100644
--- a/tools/designer/examples/credit/creditform.h
+++ b/tools/designer/examples/credit/creditform.h
@@ -2,7 +2,7 @@
 
 class CreditForm : public CreditFormBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CreditForm( TQWidget* parent = 0, const char* name = 0, 
 		bool modal = FALSE, WFlags fl = 0 );
diff --git a/tools/designer/examples/credit/creditformbase.h b/tools/designer/examples/credit/creditformbase.h
index 428b3d1b..8d8b97c6 100644
--- a/tools/designer/examples/credit/creditformbase.h
+++ b/tools/designer/examples/credit/creditformbase.h
@@ -21,7 +21,7 @@ class TQSpinBox;
 
 class CreditFormBase : public TQDialog
 { 
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CreditFormBase( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/tools/designer/examples/filechooser/widget/filechooser.h b/tools/designer/examples/filechooser/widget/filechooser.h
index 4d303a94..8a823294 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.h
+++ b/tools/designer/examples/filechooser/widget/filechooser.h
@@ -14,7 +14,7 @@ class TQPushButton;
 
 class QT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     Q_ENUMS( Mode )
     Q_PROPERTY( Mode mode READ mode WRITE setMode )
diff --git a/tools/designer/examples/opengl/glwidget.h b/tools/designer/examples/opengl/glwidget.h
index 6cb998ee..43d68783 100644
--- a/tools/designer/examples/opengl/glwidget.h
+++ b/tools/designer/examples/opengl/glwidget.h
@@ -39,7 +39,7 @@
 
 class GLWidget : public TQGLWidget
 {
-    Q_OBJECT
+    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 )
diff --git a/tools/designer/examples/receiver2/receiver.h b/tools/designer/examples/receiver2/receiver.h
index aadc6a9e..773f47ec 100644
--- a/tools/designer/examples/receiver2/receiver.h
+++ b/tools/designer/examples/receiver2/receiver.h
@@ -3,7 +3,7 @@
 
 class Receiver : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     void setParent( TQDialog *parent );
 public slots:
diff --git a/tools/designer/examples/sizeaware/sizeaware.h b/tools/designer/examples/sizeaware/sizeaware.h
index d118ed3f..8e1adaae 100644
--- a/tools/designer/examples/sizeaware/sizeaware.h
+++ b/tools/designer/examples/sizeaware/sizeaware.h
@@ -4,7 +4,7 @@
 
 class SizeAware : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
     Q_PROPERTY( TQString company READ company WRITE setCompany )
     Q_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile )
 public:
diff --git a/tools/designer/examples/vcr/vcr.h b/tools/designer/examples/vcr/vcr.h
index daff3d1d..1c407d17 100644
--- a/tools/designer/examples/vcr/vcr.h
+++ b/tools/designer/examples/vcr/vcr.h
@@ -4,7 +4,7 @@
 
 class Vcr : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Vcr( TQWidget *parent = 0, const char *name = 0 );
     ~Vcr() {}
diff --git a/tools/designer/plugins/cppeditor/cppbrowser.h b/tools/designer/plugins/cppeditor/cppbrowser.h
index 30d14cdc..c906eafc 100644
--- a/tools/designer/plugins/cppeditor/cppbrowser.h
+++ b/tools/designer/plugins/cppeditor/cppbrowser.h
@@ -39,7 +39,7 @@
 
 class CppEditorBrowser : public EditorBrowser
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CppEditorBrowser( Editor *e );
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.h b/tools/designer/plugins/cppeditor/cppcompletion.h
index 965fc8f3..f6d2134c 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.h
+++ b/tools/designer/plugins/cppeditor/cppcompletion.h
@@ -40,7 +40,7 @@
 
 class CppEditorCompletion : public EditorCompletion
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CppEditorCompletion( Editor *e );
diff --git a/tools/designer/plugins/cppeditor/cppeditor.h b/tools/designer/plugins/cppeditor/cppeditor.h
index a8704b1b..6df0d926 100644
--- a/tools/designer/plugins/cppeditor/cppeditor.h
+++ b/tools/designer/plugins/cppeditor/cppeditor.h
@@ -44,7 +44,7 @@ class CIndent;
 
 class  CppEditor : public Editor
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i );
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
index 238611c9..2a48277b 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
@@ -45,7 +45,7 @@ struct DesignerInterface;
 
 class EditorInterfaceImpl : public TQObject, public EditorInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     EditorInterfaceImpl();
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.h b/tools/designer/plugins/wizards/sqlformwizardimpl.h
index be3602d7..1bce4780 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.h
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.h
@@ -41,7 +41,7 @@
 
 class SqlFormWizard : public SqlFormWizardBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* parent = 0, DesignerFormWindow *fw = 0,
diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp
index df26872f..67c584b9 100644
--- a/tools/designer/tools/conv2ui/main.cpp
+++ b/tools/designer/tools/conv2ui/main.cpp
@@ -149,7 +149,7 @@ void printHelpMessage( TQStringList & formats )
 
 void printVersion()
 {
-    printf( "TQt user interface file converter for TQt version %s\n", QT_VERSION_STR );
+    printf( "TQt user interface file converter for TQt version %s\n", TQT_VERSION_STR );
 }
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index aa00988e..63cbd9bc 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -236,7 +236,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    "	if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) {\n"
 #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
 	    "	    TQByteArray baunzip;\n"
-	    "	    baunzip = qUncompress( embed_image_vec[i].data, \n"
+	    "	    baunzip = tqUncompress( embed_image_vec[i].data, \n"
 	    "		embed_image_vec[i].compressed );\n"
 	    "	    TQImage img((uchar*)baunzip.data(),\n"
 	    "			embed_image_vec[i].width,\n"
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index e185af6c..a2768de9 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -64,18 +64,18 @@ static TQByteArray unzipXPM( TQString data, ulong& length )
 	    r += l - 'a' + 10;
 	ba[ i ] = r;
     }
-    // qUncompress() expects the first 4 bytes to be the expected length of the
+    // tqUncompress() expects the first 4 bytes to be the expected length of the
     // uncompressed data
     ba[0] = ( length & 0xff000000 ) >> 24;
     ba[1] = ( length & 0x00ff0000 ) >> 16;
     ba[2] = ( length & 0x0000ff00 ) >> 8;
     ba[3] = ( length & 0x000000ff );
-    TQByteArray baunzip = qUncompress( ba, baSize );
+    TQByteArray baunzip = tqUncompress( ba, baSize );
     delete[] ba;
     return baunzip;
 }
 
-#if QT_VERSION >= 0x030900
+#if TQT_VERSION >= 0x030900
 #error Add this functionality to TQDir (relativePathTo() maybe?) and \
 remove it from here and from moc
 #endif
@@ -373,8 +373,8 @@ void Uic::createFormDecl( const TQDomElement &e )
 	out << exportMacro << " ";
     out << bareNameOfClass << " : public " << objClass << endl << "{" << endl;
 
-    /* qmake ignore Q_OBJECT */
-    out << "    Q_OBJECT" << endl;
+    /* qmake ignore TQ_OBJECT */
+    out << "    TQ_OBJECT" << endl;
     out << endl;
     out << "public:" << endl;
 
@@ -583,7 +583,7 @@ void Uic::createFormDecl( const TQDomElement &e )
     registerLayouts( e );
     out << endl;
 
-#if QT_VERSION >= 0x030900
+#if TQT_VERSION >= 0x030900
 #error Make languageChange() a virtual protected non-slot member of TQWidget
 #endif
 
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index 452aad97..dbb3962a 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -74,7 +74,7 @@ int main( int argc, char * argv[] )
     TQApplication app(argc, argv, FALSE);
 
     TQString keybase( "/TQt Designer/" + 
-	TQString::number( (QT_VERSION >> 16) & 0xff ) +"." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+	TQString::number( (TQT_VERSION >> 16) & 0xff ) +"." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" );
     TQSettings config;
     config.insertSearchPath( TQSettings::Windows, "/Trolltech" );
     TQStringList pluginPaths = config.readListEntry( keybase + "PluginPaths" );
@@ -169,7 +169,7 @@ int main( int argc, char * argv[] )
 	    } else if ( opt == "version" ) {
 		fprintf( stderr,
 			 "User Interface Compiler for TQt version %s\n",
-			 QT_VERSION_STR );
+			 TQT_VERSION_STR );
 		return 1;
 	    } else if ( opt == "help" ) {
 		break;
@@ -298,7 +298,7 @@ int main( int argc, char * argv[] )
     TQDomElement e = doc.firstChild().toElement();
     if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) {
 	qWarning( TQString("uic: File generated with too recent version of TQt Designer (%s vs. %s)"),
-		  e.attribute("version").latin1(), QT_VERSION_STR );
+		  e.attribute("version").latin1(), TQT_VERSION_STR );
 	return 1;
     }
 
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index f89b2ffb..194bb615 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -63,8 +63,8 @@ void Uic::createSubDecl( const TQDomElement &e, const TQString& subClass )
     out << "class " << subClass << " : public " << nameOfClass << endl;
     out << "{" << endl;
 
-/* tmake ignore Q_OBJECT */
-    out << "    Q_OBJECT" << endl;
+/* tmake ignore TQ_OBJECT */
+    out << "    TQ_OBJECT" << endl;
     out << endl;
     out << "public:" << endl;
 
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index 269f6c35..cbf49cc4 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -174,7 +174,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat
     if ( format == "XPM.GZ" || format == "XBM.GZ" ) {
 	if ( len < data.size() * 10 )
 	    len = data.size() * 10;
-	// qUncompress() expects the first 4 bytes to be the expected length of
+	// tqUncompress() expects the first 4 bytes to be the expected length of
 	// the uncompressed data
 	TQByteArray dataTmp( data.size() + 4 );
 	memcpy( dataTmp.data()+4, data.data(), data.size() );
@@ -182,7 +182,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat
 	dataTmp[1] = ( len & 0x00ff0000 ) >> 16;
 	dataTmp[2] = ( len & 0x0000ff00 ) >> 8;
 	dataTmp[3] = ( len & 0x000000ff );
-	TQByteArray baunzip = qUncompress( dataTmp );
+	TQByteArray baunzip = tqUncompress( dataTmp );
 	len = baunzip.size();
 	img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')) );
     } else {
@@ -491,7 +491,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
 
     if ( !connections.isNull() )
 	loadConnections( connections, connector );
-    if ( w && name && qstrlen( name ) > 0 )
+    if ( w && name && tqstrlen( name ) > 0 )
 	w->setName( name );
 
     if ( !tabOrder.isNull() )
diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf
index ecf2689a..771fff59 100644
--- a/tools/linguist/book/linguist-programmer.leaf
+++ b/tools/linguist/book/linguist-programmer.leaf
@@ -130,9 +130,9 @@ would become
     button = new QPushButton( tr("&Quit"), this);
 \endcode
 
-\index Q_OBJECT
+\index TQ_OBJECT
 
-All \l QObject subclasses that use the \c Q_OBJECT macro implement
+All \l QObject subclasses that use the \c TQ_OBJECT macro implement
 the \c tr() function.
 
 Although the \c tr() call is normally made directly since it is
@@ -581,7 +581,7 @@ version}, above, the central widget with the four buttons is an
 \skipto class ArrowPad
 \printline class ArrowPad
 
-\index Q_OBJECT
+\index TQ_OBJECT
 \index tr()
 \index QObject!tr()
 \index Translation Contexts
@@ -591,7 +591,7 @@ When \l lupdate is run it not only extracts the source texts but it
 also groups them into contexts. A context is the name of the class in
 which the source text appears. Thus, in this example, "ArrowPad" is a
 context: it is the context of the texts in the \c ArrowPad class. 
-The \c Q_OBJECT macro defines \c tr(x) in \c ArrowPad like this
+The \c TQ_OBJECT macro defines \c tr(x) in \c ArrowPad like this
 
 \index QApplication!translate()
 \index translate()!QApplication
@@ -623,17 +623,17 @@ user-visible text.
 \img tt2_en.png
 \caption Tutorial 2 Screenshot, English version
 
-\index Q_OBJECT
+\index TQ_OBJECT
 \index MainWindow!in Translation Tutorial
 
 \quotefile tt2/mainwindow.h
 \skipto QMainWindow
 \printline QMainWindow
-\printuntil Q_OBJECT
+\printuntil TQ_OBJECT
 
 In the \e {Tutorial 2 Screenshot, English version}, above, the whole
 window is a \c MainWindow. This is defined in the \c mainwindow.h
-header file. Here too, we use \c Q_OBJECT, so that \c MainWindow will
+header file. Here too, we use \c TQ_OBJECT, so that \c MainWindow will
 become a context in \e {Qt Linguist}.
 
 In the implementation of \c MainWindow, \c mainwindow.cpp, we create
@@ -850,13 +850,13 @@ The PrintPanel is defined in \c printpanel.h.
 \quotefile tt3/printpanel.h
 \skipto QVBox
 \printline QVBox
-\printuntil Q_OBJECT
+\printuntil TQ_OBJECT
 
-\index Q_OBJECT
+\index TQ_OBJECT
 
 \index PrintPanel!in Translation Tutorial
 
-PrintPanel is a \l QWidget. It needs the \c Q_OBJECT macro for \c
+PrintPanel is a \l QWidget. It needs the \c TQ_OBJECT macro for \c
 tr() to work properly.
 
 The implementation file is \c printpanel.cpp.
diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h
index 43c7b589..c2576002 100644
--- a/tools/linguist/linguist/finddialog.h
+++ b/tools/linguist/linguist/finddialog.h
@@ -41,7 +41,7 @@ class TQLineEdit;
 
 class FindDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 };
 
diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h
index a85bc1dd..b1cfd944 100644
--- a/tools/linguist/linguist/msgedit.h
+++ b/tools/linguist/linguist/msgedit.h
@@ -63,7 +63,7 @@ class PhraseLV;
 
 class PageCurl : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PageCurl( TQWidget * parent = 0, const char * name = 0,
 	      WFlags f = 0 )
@@ -125,7 +125,7 @@ private:
 
 class EditorPage : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     EditorPage( TQWidget * parent = 0, const char * name = 0 );
     
@@ -157,7 +157,7 @@ signals:
 
 class MessageEditor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MessageEditor( MetaTranslator * t, TQWidget * parent = 0,
 		   const char * name = 0 );
diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h
index a48d40c0..99edb9f8 100644
--- a/tools/linguist/linguist/phrasebookbox.h
+++ b/tools/linguist/linguist/phrasebookbox.h
@@ -47,7 +47,7 @@ class PhraseLV;
 
 class PhraseBookBox : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PhraseBookBox( const TQString& filename, const PhraseBook& phraseBook,
 		   TQWidget *parent = 0, const char *name = 0,
diff --git a/tools/linguist/linguist/phraselv.h b/tools/linguist/linguist/phraselv.h
index 8135b43e..e2e7ee19 100644
--- a/tools/linguist/linguist/phraselv.h
+++ b/tools/linguist/linguist/phraselv.h
@@ -69,7 +69,7 @@ private:
 
 class PhraseLV : public TQListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PhraseLV( TQWidget *parent, const char *name );
     ~PhraseLV();
diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp
index 931ba137..8d618221 100644
--- a/tools/linguist/linguist/simtexth.cpp
+++ b/tools/linguist/linguist/simtexth.cpp
@@ -191,7 +191,7 @@ CandidateList similarTextHeuristicCandidates( const MetaTranslator *tor,
     TQValueList scores;
     CandidateList candidates;
     CoMatrix cmTarget( text );
-    int targetLen = qstrlen( text );
+    int targetLen = tqstrlen( text );
 
     TML all = tor->translatedMessages();
     TML::Iterator it;
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index e174edc5..d044ca69 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -859,7 +859,7 @@ void TrWindow::manual()
 void TrWindow::about()
 {
     AboutDialog about( this, 0, TRUE );
-    about.versionLabel->setText( tr("Version %1").arg(QT_VERSION_STR) );
+    about.versionLabel->setText( tr("Version %1").arg(TQT_VERSION_STR) );
     about.exec();
 }
 
@@ -1847,8 +1847,8 @@ bool TrWindow::danger( const TQString& source, const TQString& translation,
 void TrWindow::readConfig()
 {
     TQString keybase( "/TQt Linguist/" +
-		     TQString::number( (QT_VERSION >> 16) & 0xff ) +
-		     "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+		     TQString::number( (TQT_VERSION >> 16) & 0xff ) +
+		     "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" );
     TQSettings config;
 
     config.insertSearchPath( TQSettings::Windows, "/Trolltech" );
@@ -1918,8 +1918,8 @@ void TrWindow::readConfig()
 void TrWindow::writeConfig()
 {
     TQString keybase( "/TQt Linguist/" +
-		     TQString::number( (QT_VERSION >> 16) & 0xff ) +
-		     "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+		     TQString::number( (TQT_VERSION >> 16) & 0xff ) +
+		     "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" );
     TQSettings config;
 
     config.insertSearchPath( TQSettings::Windows, "/Trolltech" );
diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h
index af20b487..82fc4ec1 100644
--- a/tools/linguist/linguist/trwindow.h
+++ b/tools/linguist/linguist/trwindow.h
@@ -63,7 +63,7 @@ class Statistics;
 
 class TrWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     static TQPixmap * pxOn;
     static TQPixmap * pxOff;
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 9dc6b07e..587f6210 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -120,7 +120,7 @@ int main( int argc, char **argv )
 	    verbose = TRUE;
 	    continue;
 	} else if ( qstrcmp(argv[i], "-version") == 0 ) {
-	    fprintf( stderr, "lrelease version %s\n", QT_VERSION_STR );
+	    fprintf( stderr, "lrelease version %s\n", TQT_VERSION_STR );
 	    return 0;
 	} else if ( qstrcmp(argv[i], "-qm") == 0 ) {
 	    if ( i == argc - 1 ) {
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index a557fd51..7201f3a0 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -45,12 +45,12 @@
 #include 
 #include 
 
-/* qmake ignore Q_OBJECT */
+/* qmake ignore TQ_OBJECT */
 
 static const char MagicComment[] = "TRANSLATOR ";
 
-static TQMap needs_Q_OBJECT;
-static TQMap lacks_Q_OBJECT;
+static TQMap needs_TQ_OBJECT;
+static TQMap lacks_TQ_OBJECT;
 
 /*
   The first part of this source file is the C++ tokenizer.  We skip
@@ -75,7 +75,7 @@ static TQMap lacks_Q_OBJECT;
 */
 
 enum { Tok_Eof, Tok_class, Tok_namespace, Tok_return, Tok_tr,
-       Tok_trUtf8, Tok_translate, Tok_Q_OBJECT, Tok_Ident,
+       Tok_trUtf8, Tok_translate, Tok_TQ_OBJECT, Tok_Ident,
        Tok_Comment, Tok_String, Tok_Arrow, Tok_Colon,
        Tok_Gulbrandsen, Tok_LeftBrace, Tok_RightBrace, Tok_LeftParen,
        Tok_RightParen, Tok_Comma, Tok_Semicolon };
@@ -167,7 +167,7 @@ static int getToken()
 	    switch ( yyIdent[0] ) {
 	    case 'Q':
 		if ( strcmp(yyIdent + 1, "_OBJECT") == 0 ) {
-		    return Tok_Q_OBJECT;
+		    return Tok_TQ_OBJECT;
 		} else if ( strcmp(yyIdent + 1, "T_TR_NOOP") == 0 ) {
 		    return Tok_tr;
 		} else if ( strcmp(yyIdent + 1, "T_TRANSLATE_NOOP") == 0 ) {
@@ -480,7 +480,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
     TQCString functionContext = initialContext;
     TQCString prefix;
     bool utf8 = FALSE;
-    bool missing_Q_OBJECT = FALSE;
+    bool missing_TQ_OBJECT = FALSE;
 
     yyTok = getToken();
     while ( yyTok != Tok_Eof ) {
@@ -511,7 +511,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		}
 
 		if ( yyTok == Tok_Colon ) {
-		    missing_Q_OBJECT = TRUE;
+		    missing_TQ_OBJECT = TRUE;
 		} else {
 		    functionContext = defaultContext;
 		}
@@ -550,13 +550,13 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		    tor->insert( MetaTranslatorMessage(context, text, com,
 						       TQString::null, utf8) );
 
-		    if ( lacks_Q_OBJECT.contains(context) ) {
-			qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
+		    if ( lacks_TQ_OBJECT.contains(context) ) {
+			qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) context );
-			lacks_Q_OBJECT.remove( context );
+			lacks_TQ_OBJECT.remove( context );
 		    } else {
-			needs_Q_OBJECT.insert( context, 0 );
+			needs_TQ_OBJECT.insert( context, 0 );
 		    }
 		}
 	    }
@@ -580,8 +580,8 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 						       TQString::null, utf8) );
 	    }
 	    break;
-	case Tok_Q_OBJECT:
-	    missing_Q_OBJECT = FALSE;
+	case Tok_TQ_OBJECT:
+	    missing_TQ_OBJECT = FALSE;
 	    yyTok = getToken();
 	    break;
 	case Tok_Ident:
@@ -637,17 +637,17 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		 yyBraceDepth + 1 == (int) namespaces.count() )
 		namespaces.remove( namespaces.fromLast() );
 	    if ( yyBraceDepth == (int) namespaces.count() ) {
-		if ( missing_Q_OBJECT ) {
-		    if ( needs_Q_OBJECT.contains(functionContext) ) {
-			qWarning( "%s:%d: Class '%s' lacks Q_OBJECT macro",
+		if ( missing_TQ_OBJECT ) {
+		    if ( needs_TQ_OBJECT.contains(functionContext) ) {
+			qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) functionContext );
 		    } else {
-			lacks_Q_OBJECT.insert( functionContext, 0 );
+			lacks_TQ_OBJECT.insert( functionContext, 0 );
 		    }
 		}
 		functionContext = defaultContext;
-		missing_Q_OBJECT = FALSE;
+		missing_TQ_OBJECT = FALSE;
 	    }
 	    yyTok = getToken();
 	    break;
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 7c933afe..1e722508 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -126,7 +126,7 @@ int main( int argc, char **argv )
 	    verbose = TRUE;
 	    continue;
 	} else if ( qstrcmp(argv[i], "-version") == 0 ) {
-	    fprintf( stderr, "lupdate version %s\n", QT_VERSION_STR );
+	    fprintf( stderr, "lupdate version %s\n", TQT_VERSION_STR );
 	    return 0;
 	} else if ( qstrcmp(argv[i], "-ts") == 0 ) {
 	    metTsFlag = TRUE;
diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp
index 52593b59..29d6fd2f 100644
--- a/tools/linguist/lupdate/numberh.cpp
+++ b/tools/linguist/lupdate/numberh.cpp
@@ -98,7 +98,7 @@ static TQString translationAttempt( const TQString& oldTranslation,
 				   const char *newSource )
 {
     int p = zeroKey( oldSource ).contains( '0' );
-    int oldSourceLen = qstrlen( oldSource );
+    int oldSourceLen = tqstrlen( oldSource );
     TQString attempt;
     TQStringList oldNumbers;
     TQStringList newNumbers;
diff --git a/tools/linguist/qdoc.conf b/tools/linguist/qdoc.conf
index 86e6066e..27ba5efe 100644
--- a/tools/linguist/qdoc.conf
+++ b/tools/linguist/qdoc.conf
@@ -5,7 +5,7 @@ OUTPUTDIR	= $QTDIR/tools/linguist/doc/html
 BASE		= file:$QTDIR/tools/linguist/doc/html/
 COMPANY		= Trolltech
 PRODUCT		= TQt Linguist
-VERSIONSYM	= QT_VERSION_STR
+VERSIONSYM	= TQT_VERSION_STR
 DEFINE		= QT_QDOC QT_.*_SUPPORT _WS_.*_
 FALSE		= 0 1
 INTERNAL	= no
diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp
index c32c5248..7c30167a 100644
--- a/tools/linguist/qm2ts/main.cpp
+++ b/tools/linguist/qm2ts/main.cpp
@@ -64,7 +64,7 @@ int main( int argc, char **argv )
 	    verbose = TRUE;
 	    continue;
 	} else if ( qstrcmp(argv[i], "-version") == 0 ) {
-	    fprintf( stderr, "qm2ts version %s\n", QT_VERSION_STR );
+	    fprintf( stderr, "qm2ts version %s\n", TQT_VERSION_STR );
 	    return 0;
 	}
 
diff --git a/tools/linguist/tutorial/tt2/arrowpad.h b/tools/linguist/tutorial/tt2/arrowpad.h
index c973523b..e0d30492 100644
--- a/tools/linguist/tutorial/tt2/arrowpad.h
+++ b/tools/linguist/tutorial/tt2/arrowpad.h
@@ -11,7 +11,7 @@
 
 class ArrowPad : public TQGrid
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ArrowPad( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/tools/linguist/tutorial/tt2/mainwindow.h b/tools/linguist/tutorial/tt2/mainwindow.h
index 0a190af0..92ecf61c 100644
--- a/tools/linguist/tutorial/tt2/mainwindow.h
+++ b/tools/linguist/tutorial/tt2/mainwindow.h
@@ -11,7 +11,7 @@
 
 class MainWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MainWindow( TQWidget *parent = 0, const char *name = 0 );
 };
diff --git a/tools/linguist/tutorial/tt3/mainwindow.h b/tools/linguist/tutorial/tt3/mainwindow.h
index c0b5812f..2007658e 100644
--- a/tools/linguist/tutorial/tt3/mainwindow.h
+++ b/tools/linguist/tutorial/tt3/mainwindow.h
@@ -11,7 +11,7 @@
 
 class MainWindow : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MainWindow( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/tools/linguist/tutorial/tt3/printpanel.h b/tools/linguist/tutorial/tt3/printpanel.h
index 565b7b62..2c7d34a6 100644
--- a/tools/linguist/tutorial/tt3/printpanel.h
+++ b/tools/linguist/tutorial/tt3/printpanel.h
@@ -11,7 +11,7 @@
 
 class PrintPanel : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PrintPanel( TQWidget *parent = 0, const char *name = 0 );
 };
diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp
index c3f233d1..5d9bb185 100644
--- a/tools/makeqpf/main.cpp
+++ b/tools/makeqpf/main.cpp
@@ -139,7 +139,7 @@ public:
 
 class MakeTQPF : public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQListView* view;
 public:
     MakeTQPF()
diff --git a/tools/qconfig/main.h b/tools/qconfig/main.h
index 6d68b97d..48ffacdd 100644
--- a/tools/qconfig/main.h
+++ b/tools/qconfig/main.h
@@ -42,7 +42,7 @@ class TQListView;
 class TQLabel;
 
 class Info : public TQTextBrowser {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Info( TQWidget* parent, const char* name=0 );
 
@@ -54,7 +54,7 @@ public slots:
 };
 
 class Main : public TQMainWindow {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Main();
     void loadFeatures(const TQString& filename);
diff --git a/tools/qtconfig/colorbutton.h b/tools/qtconfig/colorbutton.h
index 504579df..9b1351f6 100644
--- a/tools/qtconfig/colorbutton.h
+++ b/tools/qtconfig/colorbutton.h
@@ -39,7 +39,7 @@
 
 class ColorButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ColorButton(TQWidget *, const char * = 0);
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index e3f11366..bf399bd4 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -490,7 +490,7 @@ void MainWindow::fileSave()
 
 	TQStringList libpath = TQApplication::libraryPaths();
 	TQString libpathkey =
-	    TQString("/qt/%1.%2/libraryPath").arg( QT_VERSION >> 16 ).arg( (QT_VERSION & 0xff00 ) >> 8 );
+	    TQString("/qt/%1.%2/libraryPath").arg( TQT_VERSION >> 16 ).arg( (TQT_VERSION & 0xff00 ) >> 8 );
 	settings.writeEntry(libpathkey, libpath, ':');
 	settings.writeEntry("/qt/fontPath", fontpaths, ':');
 	settings.writeEntry("/qt/embedFonts", fontembeddingcheckbox->isChecked() );
diff --git a/tools/qtconfig/mainwindow.h b/tools/qtconfig/mainwindow.h
index a539f905..7e4fa4f7 100644
--- a/tools/qtconfig/mainwindow.h
+++ b/tools/qtconfig/mainwindow.h
@@ -39,7 +39,7 @@
 
 class MainWindow : public MainWindowBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     MainWindow();
diff --git a/tools/qtconfig/paletteeditoradvanced.h b/tools/qtconfig/paletteeditoradvanced.h
index 457b1c67..c1724a65 100644
--- a/tools/qtconfig/paletteeditoradvanced.h
+++ b/tools/qtconfig/paletteeditoradvanced.h
@@ -38,7 +38,7 @@
 
 class PaletteEditorAdvanced : public PaletteEditorAdvancedBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PaletteEditorAdvanced( TQWidget * parent=0, const char * name=0,
 			   bool modal=FALSE, WFlags f=0 );
diff --git a/tools/qtconfig/previewframe.h b/tools/qtconfig/previewframe.h
index d0ec6eb3..8aead5a3 100644
--- a/tools/qtconfig/previewframe.h
+++ b/tools/qtconfig/previewframe.h
@@ -41,7 +41,7 @@
 
 class Workspace : public TQWorkspace
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Workspace( TQWidget* parent = 0, const char* name = 0 )
@@ -54,7 +54,7 @@ protected:
 
 class PreviewFrame : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PreviewFrame( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/qtconfig/previewwidget.h b/tools/qtconfig/previewwidget.h
index d74af3e6..738c0aa6 100644
--- a/tools/qtconfig/previewwidget.h
+++ b/tools/qtconfig/previewwidget.h
@@ -38,7 +38,7 @@
 
 class PreviewWidget : public PreviewWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PreviewWidget( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/qvfb/gammaview.h b/tools/qvfb/gammaview.h
index 67d4695a..268c8392 100644
--- a/tools/qvfb/gammaview.h
+++ b/tools/qvfb/gammaview.h
@@ -38,7 +38,7 @@
 
 class GammaView: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GammaView( TQWidget *parent = 0,
 		const char *name = 0, WFlags f = 0 ) :
diff --git a/tools/qvfb/qvfb.h b/tools/qvfb/qvfb.h
index 59a051d5..518e1d76 100644
--- a/tools/qvfb/qvfb.h
+++ b/tools/qvfb/qvfb.h
@@ -42,7 +42,7 @@ class Config;
 
 class TQVFb: public TQMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent = 0,
 		const char *name = 0, uint wflags = 0 );
diff --git a/tools/qvfb/qvfbratedlg.h b/tools/qvfb/qvfbratedlg.h
index 28c9c17d..2e514c5d 100644
--- a/tools/qvfb/qvfbratedlg.h
+++ b/tools/qvfb/qvfbratedlg.h
@@ -38,7 +38,7 @@ class TQSlider;
 
 class TQVFbRateDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVFbRateDialog( int value, TQWidget *parent=0, const char *name=0,
 		    bool modal=FALSE );
diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h
index 5220cb2a..dee52fb7 100644
--- a/tools/qvfb/qvfbview.h
+++ b/tools/qvfb/qvfbview.h
@@ -41,7 +41,7 @@ struct TQVFbHeader;
 
 class TQVFbView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQVFbView( int display_id, int w, int h, int d, TQWidget *parent = 0,
 		const char *name = 0, uint wflags = 0 );
diff --git a/tutorial/t10/cannon.h b/tutorial/t10/cannon.h
index 25464644..a75678fa 100644
--- a/tutorial/t10/cannon.h
+++ b/tutorial/t10/cannon.h
@@ -12,7 +12,7 @@
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t10/lcdrange.h b/tutorial/t10/lcdrange.h
index 2b689a3b..cbb69b4b 100644
--- a/tutorial/t10/lcdrange.h
+++ b/tutorial/t10/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t11/cannon.cpp b/tutorial/t11/cannon.cpp
index ad23174e..bfbc12a1 100644
--- a/tutorial/t11/cannon.cpp
+++ b/tutorial/t11/cannon.cpp
@@ -145,7 +145,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/tutorial/t11/cannon.h b/tutorial/t11/cannon.h
index 35af0527..b3b79fb9 100644
--- a/tutorial/t11/cannon.h
+++ b/tutorial/t11/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t11/lcdrange.h b/tutorial/t11/lcdrange.h
index 2b689a3b..cbb69b4b 100644
--- a/tutorial/t11/lcdrange.h
+++ b/tutorial/t11/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t12/cannon.cpp b/tutorial/t12/cannon.cpp
index e4552394..597c5464 100644
--- a/tutorial/t12/cannon.cpp
+++ b/tutorial/t12/cannon.cpp
@@ -180,7 +180,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/tutorial/t12/cannon.h b/tutorial/t12/cannon.h
index 33d5accc..79e58ea3 100644
--- a/tutorial/t12/cannon.h
+++ b/tutorial/t12/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t12/lcdrange.h b/tutorial/t12/lcdrange.h
index 41bf78fb..d71bccb3 100644
--- a/tutorial/t12/lcdrange.h
+++ b/tutorial/t12/lcdrange.h
@@ -15,7 +15,7 @@ class TQLabel;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
     LCDRange( const char *s, TQWidget *parent=0,
diff --git a/tutorial/t13/cannon.cpp b/tutorial/t13/cannon.cpp
index f97ddd2f..85a038f0 100644
--- a/tutorial/t13/cannon.cpp
+++ b/tutorial/t13/cannon.cpp
@@ -206,7 +206,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/tutorial/t13/cannon.h b/tutorial/t13/cannon.h
index adb28acd..f64fd7df 100644
--- a/tutorial/t13/cannon.h
+++ b/tutorial/t13/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t13/gamebrd.h b/tutorial/t13/gamebrd.h
index 9ad0cedc..b409ad16 100644
--- a/tutorial/t13/gamebrd.h
+++ b/tutorial/t13/gamebrd.h
@@ -20,7 +20,7 @@ class CannonField;
 
 class GameBoard : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GameBoard( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t13/lcdrange.h b/tutorial/t13/lcdrange.h
index 80738533..19bd019c 100644
--- a/tutorial/t13/lcdrange.h
+++ b/tutorial/t13/lcdrange.h
@@ -15,7 +15,7 @@ class TQLabel;
 
 class LCDRange : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
     LCDRange( const char *s, TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t14/cannon.cpp b/tutorial/t14/cannon.cpp
index d181f5b3..37bc274e 100644
--- a/tutorial/t14/cannon.cpp
+++ b/tutorial/t14/cannon.cpp
@@ -146,7 +146,7 @@ void CannonField::mouseMoveEvent( TQMouseEvent *e )
     if ( pnt.y() >= height() )
 	pnt.setY( height() - 1 );
     double rad = atan(((double)rect().bottom()-pnt.y())/pnt.x());
-    setAngle( qRound ( rad*180/3.14159265 ) );
+    setAngle( tqRound ( rad*180/3.14159265 ) );
 }
 
 
@@ -245,7 +245,7 @@ TQRect CannonField::shotRect() const
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
     TQRect r = TQRect( 0, 0, 6, 6 );
-    r.moveCenter( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    r.moveCenter( TQPoint( tqRound(x), height() - 1 - tqRound(y) ) );
     return r;
 }
 
diff --git a/tutorial/t14/cannon.h b/tutorial/t14/cannon.h
index f153cadc..79d2cb57 100644
--- a/tutorial/t14/cannon.h
+++ b/tutorial/t14/cannon.h
@@ -15,7 +15,7 @@ class TQTimer;
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t14/gamebrd.h b/tutorial/t14/gamebrd.h
index f9e03789..c264b4b6 100644
--- a/tutorial/t14/gamebrd.h
+++ b/tutorial/t14/gamebrd.h
@@ -20,7 +20,7 @@ class CannonField;
 
 class GameBoard : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     GameBoard( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t14/lcdrange.h b/tutorial/t14/lcdrange.h
index 80738533..19bd019c 100644
--- a/tutorial/t14/lcdrange.h
+++ b/tutorial/t14/lcdrange.h
@@ -15,7 +15,7 @@ class TQLabel;
 
 class LCDRange : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
     LCDRange( const char *s, TQWidget *parent=0, const char *name=0 );
diff --git a/tutorial/t7/lcdrange.h b/tutorial/t7/lcdrange.h
index 7cdc73be..24ff8d4a 100644
--- a/tutorial/t7/lcdrange.h
+++ b/tutorial/t7/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t8/cannon.h b/tutorial/t8/cannon.h
index d7b65975..d3126771 100644
--- a/tutorial/t8/cannon.h
+++ b/tutorial/t8/cannon.h
@@ -12,7 +12,7 @@
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t8/lcdrange.h b/tutorial/t8/lcdrange.h
index 2b689a3b..cbb69b4b 100644
--- a/tutorial/t8/lcdrange.h
+++ b/tutorial/t8/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t9/cannon.h b/tutorial/t9/cannon.h
index d7b65975..d3126771 100644
--- a/tutorial/t9/cannon.h
+++ b/tutorial/t9/cannon.h
@@ -12,7 +12,7 @@
 
 class CannonField : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     CannonField( TQWidget *parent=0, const char *name=0 );
 
diff --git a/tutorial/t9/lcdrange.h b/tutorial/t9/lcdrange.h
index 2b689a3b..cbb69b4b 100644
--- a/tutorial/t9/lcdrange.h
+++ b/tutorial/t9/lcdrange.h
@@ -14,7 +14,7 @@ class TQSlider;
 
 class LCDRange : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LCDRange( TQWidget *parent=0, const char *name=0 );