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

1 files changed, 7 insertions, 7 deletions

diff --git a/doc/man/man3/qaxfactory.3qt b/doc/man/man3/qaxfactory.3qt
index a1538b20d..6f0392019 100644
--- a/doc/man/man3/qaxfactory.3qt
+++ b/doc/man/man3/qaxfactory.3qt
@@ -228,7 +228,7 @@ If you implement your own factory reimplement the pure virtual functions, provid
 .br
 .fi
 .PP
-If you use the \fCQ_CLASSINFO\fR macro to provide the unique identifiers or other attributes for your class you can use the QAXFACTORY_BEGIN, QAXCLASS and QAXFACTORY_END macros to expose one or more classes as COM objects.
+If you use the \fCTQ_CLASSINFO\fR macro to provide the unique identifiers or other attributes for your class you can use the QAXFACTORY_BEGIN, QAXCLASS and QAXFACTORY_END macros to expose one or more classes as COM objects.
 .PP
 .nf
 .br
@@ -268,7 +268,7 @@ Reimplement this function to return the ActiveX server's application identifier.
 .SH "QUuid QAxFactory::classID ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the class identifier for each \fIkey\fR returned by the featureList() implementation, or an empty QUuid if this factory doesn't support the value of \fIkey\fR.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "ClassID".
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "ClassID".
 .SH "QWidget * QAxFactory::create ( const QString & key, QWidget * parent = 0, const char * name = 0 )\fC [virtual]\fR"
 Reimplement this function to return a new widget for \fIkey\fR. Propagate \fIparent\fR and \fIname\fR to the QWidget constructor. Return 0 if this factory doesn't support the value of \fIkey\fR.
 .PP
@@ -288,11 +288,11 @@ The default implementation creates a generic automation wrapper based on the met
 .SH "QUuid QAxFactory::eventsID ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the identifier of the event interface for each \fIkey\fR returned by the featureList() implementation, or an empty QUuid if this factory doesn't support the value of \fIkey\fR.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "EventsID".
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "EventsID".
 .SH "QString QAxFactory::exposeToSuperClass ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the name of the super class of \fIkey\fR up to which methods and properties should be exposed by the ActiveX control.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "ToSuperClass". If no such value is set the null-string is returned, and the functions and properties of all the super classes including QWidget will be exposed.
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "ToSuperClass". If no such value is set the null-string is returned, and the functions and properties of all the super classes including QWidget will be exposed.
 .PP
 To only expose the functions and properties of the class itself, reimplement this function to return \fIkey\fR.
 .SH "QStringList QAxFactory::featureList () const\fC [pure virtual]\fR"
@@ -316,11 +316,11 @@ MouseUp
 .TP
 MouseMove
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns TRUE if the value of the Q_CLASSINFO entry "StockEvents" is "yes". Otherwise this function returns FALSE.
+The default implementation interprets \fIkey\fR as the class name, and returns TRUE if the value of the TQ_CLASSINFO entry "StockEvents" is "yes". Otherwise this function returns FALSE.
 .SH "QUuid QAxFactory::interfaceID ( const QString & key ) const\fC [virtual]\fR"
 Reimplement this function to return the interface identifier for each \fIkey\fR returned by the featureList() implementation, or an empty QUuid if this factory doesn't support the value of \fIkey\fR.
 .PP
-The default implementation interprets \fIkey\fR as the class name, and returns the value of the Q_CLASSINFO entry "InterfaceID".
+The default implementation interprets \fIkey\fR as the class name, and returns the value of the TQ_CLASSINFO entry "InterfaceID".
 .SH "bool QAxFactory::isServer ()\fC [static]\fR"
 Returns TRUE if the application has been started (by COM) as an ActiveX server, otherwise returns FALSE.
 .PP
@@ -405,7 +405,7 @@ See also registerClass() and QSettings.
 Reimplement this function to return TRUE if \fIlicenseKey\fR is a valid license for the class \fIkey\fR, or if the current machine is licensed.
 .PP
 The default implementation returns TRUE if the class \fIkey\fR is not
-licensed (ie. no Q_CLASSINFO attribute "LicenseKey"), or if 
+licensed (ie. no TQ_CLASSINFO attribute "LicenseKey"), or if 
 \fIlicenseKey\fR matches the value of the "LicenseKey" attribute, or
 if the machine is licensed through a .LIC file with the same filename
 as this COM server.