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

1 files changed, 14 insertions, 14 deletions

diff --git a/doc/html/qaxserver.html b/doc/html/qaxserver.html
index 84d939fe2..8ab281cb0 100644
--- a/doc/html/qaxserver.html
+++ b/doc/html/qaxserver.html
@@ -388,9 +388,9 @@ or any existing TQWidget subclass:
  
 <p> The <a href="metaobjects.html#TQ_OBJECT">TQ_OBJECT</a> macro is required to provide the <a href="metaobjects.html#meta-object">meta object</a> information
 about the widget to the ActiveTQt framework.
-Use the <tt>Q_PROPERTY</tt> macro to declare properties for the ActiveX control:
+Use the <tt>TQ_PROPERTY</tt> macro to declare properties for the ActiveX control:
 <p> <pre>
-        Q_PROPERTY( int value READ value WRITE setValue )
+        TQ_PROPERTY( int value READ value WRITE setValue )
     </pre>
  
 <p> Declare a standard TQWidget constructor taking a parent widget and a name, 
@@ -593,7 +593,7 @@ slots are:
 <td valign="top">TQPoint&
 <td valign="top">[in, out] struct <a href="ntqpoint.html">TQPoint</a> (user defined)
 </table></center>
-<p> Also supported are exported enums and sets (see Q_ENUMS and Q_SETS).
+<p> Also supported are exported enums and sets (see TQ_ENUMS and TQ_SETS).
 The in-parameter types are also supported as return values.
 <p> Properties and signals/slots that have parameters using any other
 data types are ignored by the TQActiveX framework.
@@ -800,7 +800,7 @@ ActiveTQt. Note that some clients support only in-process controls.
 <p> Microsoft Office applications are supported, but you need to register
 the controls as "Insertable" objects. Reimplement <tt>TQAxFactory::registerClass</tt>
 to add this attribute to the COM class, or set the "Insertable" class info
-for your class to "yes" using the Q_CLASSINFO macro.
+for your class to "yes" using the TQ_CLASSINFO macro.
 <p> <h4> Unsupported Clients
 </h4>
 <a name="7-1-2"></a><p> We have not managed to make ActiveTQt based COM objects work with the
@@ -839,7 +839,7 @@ functions and properties into its own interface.
 </h3>
 <a name="8-2"></a><p> An alternative way to reimplementing TQAxFactory to have more control
 about how objects are registered or exposed is to provide class
-specific information using the Q_CLASSINFO macro, which is part of
+specific information using the TQ_CLASSINFO macro, which is part of
 TQt's meta object system.
 <p> <center><table cellpadding="4" cellspacing="2" border="0">
 <tr bgcolor="#a2c511">
@@ -915,14 +915,14 @@ Office applications.
     class MyActiveX : public <a href="ntqwidget.html">TQWidget</a>
     {
         TQ_OBJECT
-        <b>Q_CLASSINFO("Version", "2.0")
-        Q_CLASSINFO("ClassID", "{7a4cffd8-cbcd-4ae9-ae7e-343e1e5710df}")
-        Q_CLASSINFO("InterfaceID", "{6fb035bf-8019-48d8-be51-ef05427d8994}")
-        Q_CLASSINFO("EventsID", "{c42fffdf-6557-47c9-817a-2da2228bc29c}")
-        Q_CLASSINFO("Insertable", "yes")
-        Q_CLASSINFO("ToSuperClass", "MyActiveX")</b>
+        <b>TQ_CLASSINFO("Version", "2.0")
+        TQ_CLASSINFO("ClassID", "{7a4cffd8-cbcd-4ae9-ae7e-343e1e5710df}")
+        TQ_CLASSINFO("InterfaceID", "{6fb035bf-8019-48d8-be51-ef05427d8994}")
+        TQ_CLASSINFO("EventsID", "{c42fffdf-6557-47c9-817a-2da2228bc29c}")
+        TQ_CLASSINFO("Insertable", "yes")
+        TQ_CLASSINFO("ToSuperClass", "MyActiveX")</b>
 
-        Q_PROPERTY( ...
+        TQ_PROPERTY( ...
     public:
         MyActiveX(TQWidget *parent = 0, const char *name = 0);
 
@@ -939,14 +939,14 @@ own software.
 <p> Licensing components can be done using a variety of techniques, e.g. the code
 creating the control can provide a license key, or the machine on which the
 control is supposed to run needs to be licensed.
-<p> To mark a TQt class as licensed specify a "LicenseKey" using the <tt>Q_CLASSINFO</tt>
+<p> To mark a TQt class as licensed specify a "LicenseKey" using the <tt>TQ_CLASSINFO</tt>
 macro.
 
     <pre>
     class MyLicensedControl : public <a href="ntqwidget.html">TQWidget</a>
     {
         TQ_OBJECT
-        <b>Q_CLASSINFO("LicenseKey", "&lt;key string&gt;")</b>
+        <b>TQ_CLASSINFO("LicenseKey", "&lt;key string&gt;")</b>
     ...
     };
     </pre>