diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /src/kernel/ntqobjectdefs.h | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/ntqobjectdefs.h')
| -rw-r--r-- | src/kernel/ntqobjectdefs.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index 3b4b71e1d..d9b18722e 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -49,17 +49,17 @@ #ifndef QT_NO_TRANSLATION # ifndef QT_NO_TEXTCODEC // full set of tr functions -# define QT_TR_FUNCTIONS \ +# define TQT_TR_FUNCTIONS \ static TQString tr( const char *, const char * = 0 ); \ static TQString trUtf8( const char *, const char * = 0 ); # else // no TQTextCodec, no utf8 -# define QT_TR_FUNCTIONS \ +# define TQT_TR_FUNCTIONS \ static TQString tr( const char *, const char * = 0 ); # endif #else // inherit the ones from TQObject -# define QT_TR_FUNCTIONS +# define TQT_TR_FUNCTIONS #endif #ifndef QT_NO_PROPERTIES @@ -82,10 +82,10 @@ struct TQUObject; #define Q_OVERRIDE( text ) Q_OVERRIDE( text ) #define Q_ENUMS( x ) Q_ENUMS( x ) #define Q_SETS( x ) Q_SETS( x ) - /* tmake ignore Q_OBJECT */ -#define Q_OBJECT Q_OBJECT - /* tmake ignore Q_OBJECT */ -#define Q_OBJECT_FAKE Q_OBJECT_FAKE + /* tmake ignore TQ_OBJECT */ +#define TQ_OBJECT TQ_OBJECT + /* tmake ignore TQ_OBJECT */ +#define TQ_OBJECT_FAKE TQ_OBJECT_FAKE #else #define slots // slots: in class @@ -99,8 +99,8 @@ struct TQUObject; #define Q_ENUMS( x ) #define Q_SETS( x ) -/* tmake ignore Q_OBJECT */ -#define Q_OBJECT \ +/* tmake ignore TQ_OBJECT */ +#define TQ_OBJECT \ public: \ virtual TQMetaObject *metaObject() const { \ return staticMetaObject(); \ @@ -112,12 +112,12 @@ public: \ QT_PROP_FUNCTIONS \ static TQMetaObject* staticMetaObject(); \ TQObject* qObject() { return (TQObject*)this; } \ - QT_TR_FUNCTIONS \ + TQT_TR_FUNCTIONS \ private: \ static TQMetaObject *metaObj; -/* tmake ignore Q_OBJECT */ -#define Q_OBJECT_FAKE Q_OBJECT +/* tmake ignore TQ_OBJECT */ +#define TQ_OBJECT_FAKE TQ_OBJECT #endif |