Automated update from Qt3

1 files changed, 5 insertions, 5 deletions

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
 <!-- index Subclassing --><p>When subclassing a form it is helpful to use a naming convention to help us identify which files are generated from <em>TQt Designer</em>'s<!-- index .ui --> <tt>.ui</tt> files and which are hand coded.</p>
 <p>Suppose, for example, that we are developing a dialog and writing the code directly in <em>TQt Designer</em>. We might call our dialog 'OptionsForm' and the<!-- index .ui --> <tt>.ui</tt> file, <tt>optionsform.ui</tt>. The automatically generated files will be <tt>optionsform.h</tt> and <tt>optionsform.cpp</tt>.</p>
 <p>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<!-- index .ui --> <tt>.ui</tt> file <tt>settingsformbase.ui</tt>. The automatically generated files would then be called <tt>settingsformbase.h</tt> and <tt>settingsformbase.cpp</tt>. We would then call our subclass 'SettingsForm' and code it in the files <tt>settingsform.h</tt> and <tt>settingsform.cpp</tt>.</p>
-<!-- index Q_OBJECT!Macros --><!-- index Macros!Q_OBJECT --><!-- index Signals and Slots!Q_OBJECT --><p>Any subclass of a form should include the <tt>Q_OBJECT</tt> macro so that slots and signals will work correctly. Once you've created your subclass be sure to add the<!-- index .h --> <tt>.h</tt> and the<!-- index .cpp --> <tt>.cpp</tt> files to the<!-- index .pro --> <tt>.pro</tt> project file. For example we would add the following lines for our subclassed 'SettingsForm' at the end of the<!-- index .pro --> <tt>.pro</tt> file:</p>
+<!-- index TQ_OBJECT!Macros --><!-- index Macros!TQ_OBJECT --><!-- index Signals and Slots!TQ_OBJECT --><p>Any subclass of a form should include the <tt>TQ_OBJECT</tt> macro so that slots and signals will work correctly. Once you've created your subclass be sure to add the<!-- index .h --> <tt>.h</tt> and the<!-- index .cpp --> <tt>.cpp</tt> files to the<!-- index .pro --> <tt>.pro</tt> project file. For example we would add the following lines for our subclassed 'SettingsForm' at the end of the<!-- index .pro --> <tt>.pro</tt> file:</p>
 <pre>
 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( <a href="ntqwidget.html">TQWidget</a>* parent = 0, const char* name = 0,
                     bool modal = FALSE, WFlags fl = 0 );
@@ -111,7 +111,7 @@ int main( int argc, char *argv[] )
         void setAmount();
     };
 </pre>
-<!-- index Macros!Q_OBJECT --><!-- index Q_OBJECT --> <p>We've declared the slot, <tt>setAmount()</tt>, that we created in <em>TQt Designer</em>. The <tt>Q_OBJECT</tt> macro is included because it is essential for classes that use signals and slots.</p>
+<!-- index Macros!TQ_OBJECT --><!-- index TQ_OBJECT --> <p>We've declared the slot, <tt>setAmount()</tt>, that we created in <em>TQt Designer</em>. The <tt>TQ_OBJECT</tt> macro is included because it is essential for classes that use signals and slots.</p>
 <p>The implementation in <tt>qt/tools/designer/examples/credit/creditform.cpp</tt> is simple:</p>
 <pre>    #include &lt;<a href="qradiobutton-h.html">ntqradiobutton.h</a>&gt;
     #include &lt;<a href="qspinbox-h.html">ntqspinbox.h</a>&gt;
@@ -250,7 +250,7 @@ INCLUDEPATH += $(QTDIR)/tools/designer/uilib
 
 class Receiver : public <a href="ntqobject.html">TQObject</a>
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     void setParent( <a href="ntqdialog.html">TQDialog</a> *parent );
 public slots:
@@ -259,7 +259,7 @@ private:
     <a href="ntqdialog.html">TQDialog</a> *p;
 };
 </pre>
-<!-- index Macros!Q_OBJECT --><!-- index Q_OBJECT!Macros --><p>Our class must be a <a href="ntqobject.html">TQObject</a> subclass and because we're using signals and slots it must include the <tt>Q_OBJECT</tt> macro. We declare a function and the <tt>setAmount()</tt> slot that we wish to implement as well as a private <a href="ntqdialog.html">TQDialog</a> pointer.</p>
+<!-- index Macros!TQ_OBJECT --><!-- index TQ_OBJECT!Macros --><p>Our class must be a <a href="ntqobject.html">TQObject</a> subclass and because we're using signals and slots it must include the <tt>TQ_OBJECT</tt> macro. We declare a function and the <tt>setAmount()</tt> slot that we wish to implement as well as a private <a href="ntqdialog.html">TQDialog</a> pointer.</p>
 <p>The implementation requires the header files of the classes it uses:</p>
 <pre>    #include &lt;<a href="qradiobutton-h.html">ntqradiobutton.h</a>&gt;
     #include &lt;<a href="qspinbox-h.html">ntqspinbox.h</a>&gt;