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

1 files changed, 13 insertions, 13 deletions

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