diff options
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
-rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index efce4d5456..705956869d 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -83,9 +83,6 @@ class QString; #define Q_OVERRIDE(text) #define Q_ENUMS(x) #define Q_FLAGS(x) -#ifdef QT3_SUPPORT -# define Q_SETS(x) -#endif #define Q_SCRIPTABLE #define Q_INVOKABLE #define Q_SIGNAL @@ -188,9 +185,6 @@ private: #define Q_OVERRIDE(text) Q_OVERRIDE(text) #define Q_ENUMS(x) Q_ENUMS(x) #define Q_FLAGS(x) Q_FLAGS(x) -#ifdef QT3_SUPPORT -# define Q_SETS(x) Q_SETS(x) -#endif /* tmake ignore Q_OBJECT */ #define Q_OBJECT Q_OBJECT /* tmake ignore Q_OBJECT */ @@ -233,12 +227,6 @@ Q_CORE_EXPORT const char *qFlagLocation(const char *method); # define SIGNAL(a) "2"#a #endif -#ifdef QT3_SUPPORT -#define METHOD_CODE 0 // member type codes -#define SLOT_CODE 1 -#define SIGNAL_CODE 2 -#endif - #define QMETHOD_CODE 0 // member type codes #define QSLOT_CODE 1 #define QSIGNAL_CODE 2 @@ -461,10 +449,6 @@ struct Q_CORE_EXPORT QMetaObject int static_metacall(Call, int, void **) const; static int metacall(QObject *, Call, int, void **); -#ifdef QT3_SUPPORT - QT3_SUPPORT const char *superClassName() const; -#endif - struct { // private data const QMetaObject *superdata; const char *stringdata; @@ -494,11 +478,6 @@ inline const char *QMetaObject::className() const inline const QMetaObject *QMetaObject::superClass() const { return d.superdata; } -#ifdef QT3_SUPPORT -inline const char *QMetaObject::superClassName() const -{ return d.superdata ? d.superdata->className() : 0; } -#endif - QT_END_NAMESPACE QT_END_HEADER |