diff options
| author | Darrell Anderson <[email protected]> | 2012-10-21 18:55:44 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-10-21 18:55:44 -0500 |
| commit | 6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d (patch) | |
| tree | f13bbebb928d6448ff186bc596fa58fa6b8892d9 /src/kernel/ntqobjectdefs.h | |
| parent | 56cd55070ee6c5267fde1aae4d5251e400dea64d (diff) | |
| parent | 7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (diff) | |
| download | tqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.tar.gz tqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/ntqobjectdefs.h')
| -rw-r--r-- | src/kernel/ntqobjectdefs.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index 4d4e794fa..11401308b 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -77,11 +77,11 @@ struct TQUObject; #ifdef QT_MOC_CPP #define slots slots #define signals signals -#define Q_CLASSINFO( name, value ) Q_CLASSINFO( name, value ) -#define Q_PROPERTY( text ) Q_PROPERTY( text ) -#define Q_OVERRIDE( text ) Q_OVERRIDE( text ) -#define Q_ENUMS( x ) Q_ENUMS( x ) -#define Q_SETS( x ) Q_SETS( x ) +#define TQ_CLASSINFO( name, value ) TQ_CLASSINFO( name, value ) +#define TQ_PROPERTY( text ) TQ_PROPERTY( text ) +#define TQ_OVERRIDE( text ) TQ_OVERRIDE( text ) +#define TQ_ENUMS( x ) TQ_ENUMS( x ) +#define TQ_SETS( x ) TQ_SETS( x ) /* tmake ignore TQ_OBJECT */ #define TQ_OBJECT TQ_OBJECT /* tmake ignore TQ_OBJECT */ @@ -93,11 +93,11 @@ struct TQUObject; #ifndef QT_NO_EMIT #define emit // emit signal #endif -#define Q_CLASSINFO( name, value ) // class info -#define Q_PROPERTY( text ) // property -#define Q_OVERRIDE( text ) // override property -#define Q_ENUMS( x ) -#define Q_SETS( x ) +#define TQ_CLASSINFO( name, value ) // class info +#define TQ_PROPERTY( text ) // property +#define TQ_OVERRIDE( text ) // override property +#define TQ_ENUMS( x ) +#define TQ_SETS( x ) /* tmake ignore TQ_OBJECT */ #define TQ_OBJECT \ |