From eb1d1e0dec5720ace27395e290b7093cd68b150d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Mar 2012 20:38:40 -0600 Subject: Automated update from qt3 --- src/kernel/ntqobjectdefs.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/kernel/ntqobjectdefs.h') diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index d9b18722e..4d4e794fa 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -64,8 +64,8 @@ #ifndef QT_NO_PROPERTIES # define QT_PROP_FUNCTIONS \ - virtual bool qt_property( int id, int f, TQVariant* v); \ - static bool qt_static_property( TQObject* , int, int, TQVariant* ); + virtual bool tqt_property( int id, int f, TQVariant* v); \ + static bool tqt_static_property( TQObject* , int, int, TQVariant* ); #else # define QT_PROP_FUNCTIONS #endif @@ -106,9 +106,9 @@ public: \ return staticMetaObject(); \ } \ virtual const char *className() const; \ - virtual void* qt_cast( const char* ); \ - virtual bool qt_invoke( int, TQUObject* ); \ - virtual bool qt_emit( int, TQUObject* ); \ + virtual void* tqt_cast( const char* ); \ + virtual bool tqt_invoke( int, TQUObject* ); \ + virtual bool tqt_emit( int, TQUObject* ); \ QT_PROP_FUNCTIONS \ static TQMetaObject* staticMetaObject(); \ TQObject* qObject() { return (TQObject*)this; } \ @@ -165,13 +165,13 @@ class TQObjectList; class TQObjectListIt; class TQMemberDict; -Q_EXPORT void *qt_find_obj_child( TQObject *, const char *, const char * ); +Q_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * ); #define Q_CHILD(parent,type,name) \ - ((type*)qt_find_obj_child(parent,#type,name)) + ((type*)tqt_find_obj_child(parent,#type,name)) -Q_EXPORT void *qt_inheritedBy( TQMetaObject *super, const TQObject *cls ); +Q_EXPORT void *tqt_inheritedBy( TQMetaObject *super, const TQObject *cls ); template -Q_INLINE_TEMPLATES T qt_cast(const TQObject *object) -{ return (T)qt_inheritedBy( ((T)0)->staticMetaObject(), object ); } +Q_INLINE_TEMPLATES T tqt_cast(const TQObject *object) +{ return (T)tqt_inheritedBy( ((T)0)->staticMetaObject(), object ); } #endif // TQOBJECTDEFS_H -- cgit v1.2.1