From 359640943bcf155faa9a067dde9e00a123276290 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Feb 2012 17:43:39 -0600 Subject: Automated update from Qt3 --- doc/html/aclock-example.html | 2 +- doc/html/activeqt-dotnet.html | 2 +- doc/html/addressbook-example.html | 4 +- doc/html/biff-example.html | 2 +- doc/html/buttongroups-example.html | 2 +- doc/html/canvas-chart-example.html | 2 +- doc/html/canvas-example.html | 4 +- doc/html/chart-canvasview-h.html | 2 +- doc/html/chart-chartform-h.html | 2 +- doc/html/chart-optionsform-h.html | 2 +- doc/html/chart-setdataform-h.html | 2 +- doc/html/checklists-example.html | 2 +- doc/html/clientserver-example.html | 8 ++-- doc/html/commonproblems.html | 2 +- doc/html/customstyles.html | 2 +- doc/html/dclock-example.html | 2 +- doc/html/debug.html | 14 +++---- doc/html/designer-manual-6.html | 10 ++--- doc/html/designer-manual-7.html | 10 ++--- doc/html/designer-manual-9.html | 4 +- doc/html/dirview-example.html | 2 +- doc/html/drawdemo-example.html | 2 +- doc/html/fileiconview-example.html | 6 +-- doc/html/forever-example.html | 2 +- doc/html/functions.html | 4 +- doc/html/grapher-nsplugin-example.html | 4 +- doc/html/hello-example.html | 2 +- doc/html/helpsystem-example.html | 4 +- doc/html/helpviewer-example.html | 2 +- doc/html/httpd-example.html | 4 +- doc/html/i18n-example.html | 2 +- doc/html/iconview-example.html | 2 +- doc/html/iconview-simple_dd-main-h.html | 4 +- doc/html/index | 2 +- doc/html/integration.html | 4 +- doc/html/life-example.html | 2 +- doc/html/lineedits-example.html | 2 +- doc/html/linguist-manual-4.html | 14 +++---- doc/html/listbox-example.html | 2 +- doc/html/listboxcombo-example.html | 2 +- doc/html/listviews-example.html | 4 +- doc/html/mail-example.html | 2 +- doc/html/mdi-example.html | 4 +- doc/html/menu-example.html | 22 +++++------ doc/html/metaobjects.html | 14 +++---- doc/html/moc.html | 36 +++++++++--------- doc/html/movies-example.html | 4 +- doc/html/networkprotocol-example.html | 2 +- doc/html/ntqapplication.html | 12 +++--- doc/html/ntqfile.html | 2 +- doc/html/ntqobject.html | 12 +++--- doc/html/ntqspinbox.html | 2 +- doc/html/ntqvaluelist.html | 2 +- doc/html/ntqvaluevector.html | 2 +- doc/html/outliner-example.html | 2 +- doc/html/popup-example.html | 4 +- doc/html/porting.html | 6 +-- doc/html/process-example.html | 2 +- doc/html/progress-example.html | 8 ++-- doc/html/progressbar-example.html | 2 +- doc/html/properties.html | 4 +- doc/html/qaccel-h.html | 4 +- doc/html/qaction-application-example.html | 2 +- doc/html/qaction-h.html | 8 ++-- doc/html/qapplication-h.html | 4 +- doc/html/qassistantclient-h.html | 2 +- doc/html/qasyncio-h.html | 2 +- doc/html/qaxbindable.html | 2 +- doc/html/qaxobject.html | 2 +- doc/html/qaxscript-h.html | 4 +- doc/html/qaxserver-example-hierarchy.html | 4 +- doc/html/qaxserver-example-multiple.html | 6 +-- doc/html/qaxserver-example-opengl.html | 2 +- doc/html/qaxserver-example-simple.html | 2 +- doc/html/qaxserver.html | 12 +++--- doc/html/qaxwidget.html | 2 +- doc/html/qbuffer-h.html | 2 +- doc/html/qbutton-h.html | 4 +- doc/html/qbuttongroup-h.html | 4 +- doc/html/qcanvas-h.html | 18 ++++----- doc/html/qcdestyle-h.html | 2 +- doc/html/qcheckbox-h.html | 4 +- doc/html/qclipboard-h.html | 4 +- doc/html/qcolordialog-h.html | 4 +- doc/html/qcombobox-h.html | 4 +- doc/html/qcommonstyle-h.html | 4 +- doc/html/qcopchannel_qws-h.html | 2 +- doc/html/qcstring-h.html | 14 +++---- doc/html/qdatabrowser-h.html | 4 +- doc/html/qdatastream-h.html | 2 +- doc/html/qdatatable-h.html | 6 +-- doc/html/qdataview-h.html | 6 +-- doc/html/qdatetimeedit-h.html | 16 ++++---- doc/html/qdesktopwidget-h.html | 4 +- doc/html/qdial-h.html | 4 +- doc/html/qdialog-h.html | 6 +-- doc/html/qdns-h.html | 6 +-- doc/html/qdockarea-h.html | 8 ++-- doc/html/qdockwindow-h.html | 4 +- doc/html/qdom-h.html | 2 +- doc/html/qdragobject-h.html | 28 +++++++------- doc/html/qeditorfactory-h.html | 4 +- doc/html/qerrormessage-h.html | 4 +- doc/html/qeventloop-h.html | 2 +- doc/html/qfd-example.html | 4 +- doc/html/qfile-h.html | 2 +- doc/html/qfiledialog-h.html | 8 ++-- doc/html/qfileinfo-h.html | 2 +- doc/html/qfontdialog-h.html | 4 +- doc/html/qfontmanager_qws-h.html | 2 +- doc/html/qframe-h.html | 4 +- doc/html/qftp-h.html | 4 +- doc/html/qgfxdriverplugin_qws-h.html | 2 +- doc/html/qgl-h.html | 6 +-- doc/html/qglcolormap-h.html | 2 +- doc/html/qglobal-h.html | 62 +++++++++++++++---------------- doc/html/qglwidget.html | 2 +- doc/html/qgrid-h.html | 4 +- doc/html/qgridview-h.html | 4 +- doc/html/qgroupbox-h.html | 4 +- doc/html/qguardedptr-h.html | 4 +- doc/html/qhbox-h.html | 4 +- doc/html/qhbuttongroup-h.html | 4 +- doc/html/qheader-h.html | 4 +- doc/html/qhgroupbox-h.html | 4 +- doc/html/qhostaddress-h.html | 2 +- doc/html/qhttp-h.html | 4 +- doc/html/qiconset-h.html | 2 +- doc/html/qiconview-h.html | 10 ++--- doc/html/qimage-h.html | 2 +- doc/html/qimageformatplugin-h.html | 2 +- doc/html/qinputdialog-h.html | 4 +- doc/html/qiodevice-h.html | 2 +- doc/html/qkbddriverplugin_qws-h.html | 2 +- doc/html/qkeyboard_qws-h.html | 2 +- doc/html/qlabel-h.html | 4 +- doc/html/qlayout-h.html | 22 +++++------ doc/html/qlcdnumber-h.html | 4 +- doc/html/qlibrary-h.html | 2 +- doc/html/qlineedit-h.html | 4 +- doc/html/qlistbox-h.html | 10 ++--- doc/html/qlistview-h.html | 4 +- doc/html/qlocalfs-h.html | 2 +- doc/html/qmacstyle_mac-h.html | 4 +- doc/html/qmag-example.html | 14 +++---- doc/html/qmainwindow-h.html | 4 +- doc/html/qmake-manual-8.html | 4 +- doc/html/qmenubar-h.html | 4 +- doc/html/qmenudata-h.html | 4 +- doc/html/qmessagebox-h.html | 6 +-- doc/html/qmetaobject-h.html | 2 +- doc/html/qmotif-h.html | 2 +- doc/html/qmotifdialog-h.html | 2 +- doc/html/qmotifplusstyle-h.html | 2 +- doc/html/qmotifstyle-h.html | 4 +- doc/html/qmotifwidget-h.html | 2 +- doc/html/qmousedriverplugin_qws-h.html | 2 +- doc/html/qmultilineedit-h.html | 4 +- doc/html/qmutex-h.html | 4 +- doc/html/qnetworkprotocol-h.html | 8 ++-- doc/html/qnp-h.html | 4 +- doc/html/qobject-h.html | 4 +- doc/html/qobjectcleanuphandler-h.html | 2 +- doc/html/qobjectlist-h.html | 2 +- doc/html/qpaintdevice-h.html | 2 +- doc/html/qpainter-h.html | 2 +- doc/html/qplatinumstyle-h.html | 4 +- doc/html/qpopupmenu-h.html | 4 +- doc/html/qprinter-h.html | 2 +- doc/html/qprocess-h.html | 4 +- doc/html/qprogressbar-h.html | 4 +- doc/html/qprogressdialog-h.html | 4 +- doc/html/qpushbutton-h.html | 4 +- doc/html/qradiobutton-h.html | 4 +- doc/html/qrangecontrol-h.html | 6 +-- doc/html/qscrollbar-h.html | 4 +- doc/html/qscrollview-h.html | 4 +- doc/html/qsemaphore-h.html | 2 +- doc/html/qserversocket-h.html | 4 +- doc/html/qsessionmanager-h.html | 2 +- doc/html/qsettings-h.html | 2 +- doc/html/qsgistyle-h.html | 4 +- doc/html/qsignal-h.html | 4 +- doc/html/qsignalmapper-h.html | 2 +- doc/html/qsimplerichtext-h.html | 2 +- doc/html/qsizegrip-h.html | 2 +- doc/html/qslider-h.html | 4 +- doc/html/qsocket-h.html | 6 +-- doc/html/qsocketdevice-h.html | 4 +- doc/html/qsocketnotifier-h.html | 4 +- doc/html/qsound-h.html | 4 +- doc/html/qspinbox-h.html | 4 +- doc/html/qsplashscreen-h.html | 2 +- doc/html/qsplitter-h.html | 4 +- doc/html/qsql-h.html | 4 +- doc/html/qsqlcursor-h.html | 2 +- doc/html/qsqldatabase-h.html | 6 +-- doc/html/qsqldriver-h.html | 6 +-- doc/html/qsqldriverplugin-h.html | 2 +- doc/html/qsqleditorfactory-h.html | 4 +- doc/html/qsqlerror-h.html | 2 +- doc/html/qsqlfield-h.html | 2 +- doc/html/qsqlform-h.html | 6 +-- doc/html/qsqlindex-h.html | 2 +- doc/html/qsqlpropertymap-h.html | 2 +- doc/html/qsqlquery-h.html | 2 +- doc/html/qsqlresult-h.html | 4 +- doc/html/qsqlselectcursor-h.html | 2 +- doc/html/qstatusbar-h.html | 4 +- doc/html/qstring-h.html | 4 +- doc/html/qstyle-h.html | 4 +- doc/html/qstyleplugin-h.html | 2 +- doc/html/qstylesheet-h.html | 4 +- doc/html/qt-template-lib.html | 50 ++++++++++++------------- doc/html/qt.dcf | 2 +- doc/html/qtabbar-h.html | 4 +- doc/html/qtabdialog-h.html | 4 +- doc/html/qtable-h.html | 8 ++-- doc/html/qtabwidget-h.html | 4 +- doc/html/qtextbrowser-h.html | 4 +- doc/html/qtextcodecplugin-h.html | 2 +- doc/html/qtextedit-h.html | 6 +-- doc/html/qtextstream-h.html | 6 +-- doc/html/qtextview-h.html | 4 +- doc/html/qthread-h.html | 4 +- doc/html/qthreadstorage-h.html | 4 +- doc/html/qtimer-h.html | 4 +- doc/html/qtoolbar-h.html | 4 +- doc/html/qtoolbox-h.html | 2 +- doc/html/qtoolbutton-h.html | 6 +-- doc/html/qtooltip-h.html | 4 +- doc/html/qtranslator-h.html | 4 +- doc/html/qurlinfo-h.html | 6 +-- doc/html/qurloperator-h.html | 2 +- doc/html/qvalidator-h.html | 16 ++++---- doc/html/qvaluelist-h.html | 4 +- doc/html/qvaluevector-h.html | 42 ++++++++++----------- doc/html/qvbox-h.html | 4 +- doc/html/qvbuttongroup-h.html | 4 +- doc/html/qvgroupbox-h.html | 4 +- doc/html/qwaitcondition-h.html | 2 +- doc/html/qwerty-example.html | 6 +-- doc/html/qwidget-h.html | 4 +- doc/html/qwidgetplugin-h.html | 2 +- doc/html/qwidgetstack-h.html | 4 +- doc/html/qwindowdefs-h.html | 2 +- doc/html/qwindowsstyle-h.html | 4 +- doc/html/qwindowsystem_qws-h.html | 6 +-- doc/html/qwizard-h.html | 4 +- doc/html/qworkspace-h.html | 6 +-- doc/html/qxml-h.html | 2 +- doc/html/qxtwidget-h.html | 2 +- doc/html/rangecontrols-example.html | 2 +- doc/html/regexptester-example.html | 2 +- doc/html/richtext-example.html | 2 +- doc/html/rot-example.html | 2 +- doc/html/scribble-example.html | 4 +- doc/html/scrollview-example.html | 18 ++++----- doc/html/showimg-example.html | 2 +- doc/html/signalsandslots.html | 8 ++-- doc/html/simple-application-example.html | 2 +- doc/html/simple-application.html | 2 +- doc/html/simple-font-demo-example.html | 2 +- doc/html/simple_dd-example.html | 4 +- doc/html/sound-example.html | 2 +- doc/html/sql-overview-custom1-main-h.html | 4 +- doc/html/sql-overview-form2-main-h.html | 2 +- doc/html/sql-overview-table3-main-h.html | 4 +- doc/html/sql-overview-table4-main-h.html | 6 +-- doc/html/sql.html | 10 ++--- doc/html/statistics-example.html | 2 +- doc/html/t10-cannon-h.html | 2 +- doc/html/t10-lcdrange-h.html | 2 +- doc/html/t11-cannon-cpp.html | 2 +- doc/html/t11-cannon-h.html | 2 +- doc/html/t11-lcdrange-h.html | 2 +- doc/html/t12-cannon-cpp.html | 2 +- doc/html/t12-cannon-h.html | 2 +- doc/html/t12-lcdrange-h.html | 2 +- doc/html/t13-cannon-cpp.html | 2 +- doc/html/t13-cannon-h.html | 2 +- doc/html/t13-gamebrd-h.html | 2 +- doc/html/t13-lcdrange-h.html | 2 +- doc/html/t14-cannon-cpp.html | 4 +- doc/html/t14-cannon-h.html | 2 +- doc/html/t14-gamebrd-h.html | 2 +- doc/html/t14-lcdrange-h.html | 2 +- doc/html/t7-lcdrange-h.html | 2 +- doc/html/t8-cannon-h.html | 2 +- doc/html/t8-lcdrange-h.html | 2 +- doc/html/t9-cannon-h.html | 2 +- doc/html/t9-lcdrange-h.html | 2 +- doc/html/tabdialog-example.html | 2 +- doc/html/templates.html | 2 +- doc/html/themes-example.html | 2 +- doc/html/tictac-example.html | 6 +-- doc/html/timers.html | 2 +- doc/html/tooltip-example.html | 2 +- doc/html/trivial-nsplugin-example.html | 4 +- doc/html/tutorial1-07.html | 4 +- doc/html/tutorial1-08.html | 2 +- doc/html/tutorial1-11.html | 6 +-- doc/html/tutorial1-12.html | 2 +- doc/html/tutorial1-13.html | 2 +- doc/html/tutorial1-14.html | 2 +- doc/html/tutorial2-05.html | 4 +- doc/html/tutorial2-06.html | 2 +- doc/html/tutorial2-08.html | 2 +- doc/html/tutorial2-09.html | 2 +- doc/html/wizard-example.html | 2 +- doc/html/wizard-wizard-h.html | 2 +- doc/html/xform-example.html | 6 +-- 312 files changed, 716 insertions(+), 716 deletions(-) (limited to 'doc/html') diff --git a/doc/html/aclock-example.html b/doc/html/aclock-example.html index 42fa56c37..05e1d616c 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 e5602e256..ce36ca105 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 a17f76207..54a26fcd9 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 8756b4385..306372faf 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 a6937c542..bf6b0edf0 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 f17307533..6142313ac 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 b9b0090e6..40f6d9c8d 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 d48f2a4ca..9fd16d900 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 01586c341..b4a91c075 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 12a3710fe..b65f68cba 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 1fa6efbaa..47a77b24b 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 510e3c796..54f945f02 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 13552bf94..5753ac9a2 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 8074f0f86..55da31fa0 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 541b5ee39..560a4a7b8 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 48bdaeb4e..97814072a 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 c48aa6e0c..23c84dd94 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 b07ac78a0..dfa747a96 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 50d7f36b4..339153a3d 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 d87a9451c..e25e7bc1e 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 c0a9e7f6d..ebb7deda7 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 98fae3588..07f2c1126 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 78a1a849c..b835b6f3d 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 25817f78e..b8193a0d8 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 f04d62d91..915f5a0db 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 03759058c..e373bad8b 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 821c3ec57..2d20c3128 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 69c998158..835e00d21 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 08bb94c00..a72528c9c 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 aa923a156..733d2e299 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 1cd12b0d7..a517c9493 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 a158fe431..a7e742091 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 5784205ac..b7218f5c0 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 335534ca2..6d43b50ab 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 fc5267507..55f9e412a 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 ed6771cd8..da5b3ef41 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 66611cf23..90455fa78 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 7407656bb..97645ddf5 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 c796229e4..1e1a4f870 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 ffe8ba07e..a70a7ce3d 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 04569ba62..e7600194a 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 1598c1096..e5200c75e 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 13833b943..48022b476 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 b611166cd..6b17e6b47 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 e4e804b77..4a4ec9108 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 bbc07e574..ba6c33df7 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 7c2544239..da55fea68 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 087225691..12f5c972d 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 2df65894c..ef34d5a9b 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 2c5612b00..58efb3bc6 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 2adf28d95..a146ae64a 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 02b334959..7ab4c8cde 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 b6ab42c61..b40c10377 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 cb7235979..ec0e812ae 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 38fe21f56..ba5b51fee 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 acff96e24..ec60e3c01 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 c5058a8be..39062649c 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 8949c674a..d3b8ef8c0 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 009b4dab0..a5ae52bca 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 dc54be1dd..02b4b9010 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 bba5d99ca..c40fbaf0f 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 77cbf04a8..001e2a479 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 d028aa83c..89c4f8892 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 e08e63881..df70a1edd 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 b6fb22705..858534ed1 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 404392376..a703019c0 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 074ebba60..627fae60e 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 aa5ec16d3..fe1869eec 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 5a2233228..0c29dce86 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 fcc15968c..f21644441 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 1a1ef5f78..eb1cf33eb 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 1c96259e3..4336e29c7 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 1a44d4392..6647d8bc8 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 4917179ba..5a8007c62 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 514651198..5b4e1d02d 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 2f3c5a838..4d96a31ca 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 fca0dca94..4b4e9f6f5 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 dd76a7f2c..f8a434604 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 1f7e0c5ca..3d3702d50 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 80ff0b831..13336112d 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 96324f731..87eb3f3b4 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 88f853373..f3cb9efb9 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 4b5bf5189..5f87a2d04 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 38c7d8fb1..6705512f5 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 4e14c3eb0..7151e792d 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 754c54a7b..8b9a0efaf 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 8e220f12e..1c89d100a 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 dce2fc44a..3aeef7985 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 14c60cdee..4670ca930 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 e1dcdde4b..3f3fd6414 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 07a9bd350..3b889883d 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 45a7248c8..41d895c84 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 9bb291b72..18755a3c0 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 6f6c8c6a1..e2c43d5f1 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 aa70dbf6b..72b15867d 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 65ad113ac..c8d6b6ead 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 3641c3218..9df9446b8 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 cce144c88..56921563f 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 d72de1c18..4515721d0 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 31344d9cd..042117edf 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 7adbd4fd3..b920c94ea 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 cb4d55059..46bc09534 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 3d0f5b4dc..8e9bb12aa 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 8c0457951..2e69ef0f6 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 25a4a49b7..064e97045 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 51dbff1e2..5a45c9471 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 715f04fc6..4594e0f37 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 841d7fff4..850d750c0 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 b154ecbbc..d3adb41b7 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 dcff1863d..50a3e4b36 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 eddd5cb1f..d68edae70 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 d52288b9e..d38aeb588 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 53391f2bd..88c190d91 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 3a6b37518..6a5031369 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 37710a1a3..5c866f49f 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 99ad5295c..397f2e4ee 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 4bfed71a7..85905d51e 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 a0e699505..4c3280e6a 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 4338a1dcc..873710ef8 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 6598f86bd..ad8c3c2a4 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 375532fe9..6040b7f2f 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 971aaf393..f0b13c9fd 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 fe10b65fa..75771fc02 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 95c765a0d..ee92c4a65 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 0f88e13c4..0a5c3a914 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 3bb9fd0c3..f5fa62dcd 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 bd361bf82..e05fe1034 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 6c977be03..26d28f044 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 87b7a0084..7e319bb6b 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 47c358200..7f441e87e 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 e6fe8e7f9..cdb02f1cc 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 8633f5e82..aa18888bb 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 571bdca5e..dfe36a223 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 68d5cd91e..360432c8e 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 e8101b8cd..d8fe72e3c 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 6d34c7fd9..1b5429db1 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 d65c21c9e..96dbec6d1 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 8d67f15d8..1d4bb78f1 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 0820273fc..ef328a11e 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 a7440547c..b1624b355 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 3f60e964f..5d2aba309 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 d86577f0e..91eb2d143 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 772d2e6b2..bf16abc20 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 f8c20ba98..3bfbf102e 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 c13c4c62b..819d8a3ff 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 c737e8bc3..a7d72a8f4 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 b239495c5..bfa3cb044 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 8e9690482..13917bd86 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 648c179fa..4e4cacd81 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 e61718999..5c6bb8333 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 50632a832..410f4b128 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 fda9bb6b7..848a5b988 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 068df5dca..56b2dccd2 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 56ffff284..ea191b9e9 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 66f6fec02..a1e9f797b 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 b9cc6cbe0..1288c93cf 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 2e86338f5..049b198c0 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 10ff44e9d..24d4973c8 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 1f293d43a..724fe6e77 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 6cb856656..dae446c04 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 f93836676..cb6945206 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 d358e7aca..19ae51d9e 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 a94368351..1deec7de6 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 248ba94b3..a3309c378 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 5acf3a69a..34c17d628 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 cb642b7a5..58e4dfd00 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 5a30c560b..28ea36524 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 22715bdfc..6d09d6177 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 574f410c9..ed1dad1a5 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 7a150577a..d95cfd316 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 d7dcfd3df..a57114f81 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 bfeac1d94..3b6946ebb 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 924311a36..e3f6c4e21 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 4bd7638b2..08c6ae93a 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 0af0ee7c5..73b90d814 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 f0730616f..6788e70d8 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 7bcf26e1b..80994ca70 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 88d9014cf..b92e7cd3e 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 bf9dd9aa0..0d676013f 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 a5ff2a002..1f59a3764 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 55c613038..70419ed37 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 a2a46d01d..e5a314bef 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 80622b022..7525e7b11 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 799aab1c6..a2607504d 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 3f388c3a7..ec8eb7f46 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 8b52e351e..53d49eccb 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 e2af29936..cba21ae85 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 a27e3d597..63d837263 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 15a85dff6..9af059abf 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 8a3e1ce20..3e501718e 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 e4181f50d..b9e7c0daf 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 b329d71a3..27dff4934 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 d5eb7df67..94257eb2d 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 1ff93f0ac..4e24851a5 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 7e2799230..e60370c4e 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 b90513695..dad0b5863 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 655ece56e..7277cdddc 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 6b8f34582..629a07584 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 5d0f3a3b2..e9935ce22 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 100e42629..7ce6e30d2 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 2fa14d434..537511ffb 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 315b49493..b3707d4a1 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 bcc08398b..597b21a52 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 6bc90c436..0d399dc5a 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 838f695c6..ea8a05617 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 f732c211f..f60d27ac0 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 5de045787..7846bc640 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 da3a1d4d7..7641c4423 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 d1a5eb537..3fa6e3327 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 b4027ea30..ae37a8427 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 19a737072..4fd8e1ab5 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 9bc86be58..693344111 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 bb9e8a4f5..9149f6bac 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 f76eb0496..54b025ad6 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 a879ee7d5..1ed36b860 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 2d924c61f..c7150d174 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 8648dd970..01a7efd56 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 d7ec9342e..1228d87e8 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 dfe756c64..bbd8dd5b3 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 fca1cdf20..564933da5 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 65687851d..5a5c5189b 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 858752178..893798cb3 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 342478c6e..bc0ff79c4 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 b046c1dd4..5d0742814 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 9500d699c..0dc79aab5 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 bb72f3452..f8054c686 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 aeb4271b1..b639bee72 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 c1c4af7bd..f4de4dac8 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 b2957699c..666b6d5f1 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 09bc3ea49..34034bb5d 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 e561611c4..6364d5fce 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 b63510ba4..ef885f10d 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 c7d7032ca..c4feddfde 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 3a314be24..d99c2b60b 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 5317cb3ad..ce6eb652b 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 a247846a4..16d084b87 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 70d71c386..a51eb524c 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 63f5552d9..6a1652f28 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 1ba6d29b3..ab0693b92 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 5caf55271..cffc1cddc 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 e84a36242..e28021a84 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 1bc1688e3..c1b4413da 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 aaab7af30..a4a092cfd 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 3dd51ac47..09d9ab346 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 4aa124ca2..d0c2c2ce3 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 658673a12..ff2fc747d 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 66443aa23..e5e01863a 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 4827b7068..3476c9846 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 32126b635..f5aded811 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 e66c4a252..7e08d064d 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 b30a85f1e..1abf42c8d 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 e2f04beac..122a636ca 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 632196c84..22b802f99 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 432d3f561..b12c40653 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 2540895f9..eea3cfc2b 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 ced6f0d51..64aacf9c3 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 1b0acd04d..b354b6d93 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 5f5ddd7b5..0c33a7ff1 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 48d883ee5..701b69304 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 0421e7bcf..4b4059ebc 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 1fe091b92..25ee03d54 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 fd1d669d9..95af018e3 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 748a65343..f2624e3fd 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 95103a10d..50add5a04 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 c2ba5b421..2cb987060 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 555616147..0798283b3 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 5c0e6ceab..a1eead4a8 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 1443144e6..b4f2715db 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 dc5da4d74..883e924e6 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 c57f7ab2a..4389fe12b 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 7fb5fa0ac..d34279d06 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 9a6653549..40ef1a714 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 620071822..e16669d58 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 eeb1104f6..88b4a7b13 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 125408fe9..094b63b92 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 426796315..d23be5af2 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 b2db3338f..cd9ad6675 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 4a696f455..dd88c1ada 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 e15e01385..ca80db184 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 a18df62d1..ba28b19f3 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 93c46edc8..fbfe7ad73 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 11ec5e1c3..f983d61da 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 c25b5ea20..4f8299a67 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 98ecd47b3..6c3bd3b73 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 df333650b..28eb050b5 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 d133dcb63..b5f215fb5 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 c2adaf32e..181cf7db8 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 d274c0403..90e9cbef8 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 e0d61782f..03808f9b9 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 8c7ddd857..0c3fa65eb 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 0e848733f..e84c93db7 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 6c4ad889e..91f1cf124 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 70ba7cac3..a520a6d60 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 a7335e534..624f1208f 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 6d5fe2717..820ea49ac 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 b15ee6459..85579a1ed 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 0dc2cd561..5494efbf9 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 6c85ce2ee..18be95c16 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 0e4f7ba82..6b974096d 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 706ba9ee7..8af0bd977 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 fb88d4bdb..a98e8e301 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 1d091f26a..0c2da3bf4 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 4db7280eb..9c73cd149 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 b7aa3fcf6..102d237b4 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 5a24a0d82..f3d7a909d 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 22d1e7bee..8583795f3 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 baf5493c6..762649abf 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 331ee3db8..1e30c2c5b 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 52f6678d5..4833b6905 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 9882fb9c6..c7b7b7b74 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 638baad7e..3faaeec8f 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 7ee9da2b7..864f94f5a 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:
-- 
cgit v1.2.3