diff options
Diffstat (limited to 'src/widgets/kernel/qwidgetsvariant.cpp')
-rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index c8ba07fa81..a349e161e3 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -135,8 +135,8 @@ static const QVariant::Handler widgets_handler = { struct QMetaTypeGuiHelper { - QMetaType::Constructor constr; - QMetaType::Destructor destr; + QMetaType::Creator creator; + QMetaType::Deleter deleter; #ifndef QT_NO_DATASTREAM QMetaType::SaveOperator saveOp; QMetaType::LoadOperator loadOp; @@ -148,16 +148,16 @@ extern Q_CORE_EXPORT const QMetaTypeGuiHelper *qMetaTypeWidgetsHelper; #ifdef QT_NO_DATASTREAM # define Q_DECL_METATYPE_HELPER(TYPE) \ - typedef void *(*QConstruct##TYPE)(const TYPE *); \ - static const QConstruct##TYPE qConstruct##TYPE = qMetaTypeConstructHelper<TYPE>; \ - typedef void (*QDestruct##TYPE)(TYPE *); \ - static const QDestruct##TYPE qDestruct##TYPE = qMetaTypeDeleteHelper<TYPE>; + typedef void *(*QCreate##TYPE)(const TYPE *); \ + static const QCreate##TYPE qCreate##TYPE = qMetaTypeCreateHelper<TYPE>; \ + typedef void (*QDelete##TYPE)(TYPE *); \ + static const QDelete##TYPE qDelete##TYPE = qMetaTypeDeleteHelper<TYPE>; #else # define Q_DECL_METATYPE_HELPER(TYPE) \ - typedef void *(*QConstruct##TYPE)(const TYPE *); \ - static const QConstruct##TYPE qConstruct##TYPE = qMetaTypeConstructHelper<TYPE>; \ - typedef void (*QDestruct##TYPE)(TYPE *); \ - static const QDestruct##TYPE qDestruct##TYPE = qMetaTypeDeleteHelper<TYPE>; \ + typedef void *(*QCreate##TYPE)(const TYPE *); \ + static const QCreate##TYPE qCreate##TYPE = qMetaTypeCreateHelper<TYPE>; \ + typedef void (*QDelete##TYPE)(TYPE *); \ + static const QDelete##TYPE qDelete##TYPE = qMetaTypeDeleteHelper<TYPE>; \ typedef void (*QSave##TYPE)(QDataStream &, const TYPE *); \ static const QSave##TYPE qSave##TYPE = qMetaTypeSaveHelper<TYPE>; \ typedef void (*QLoad##TYPE)(QDataStream &, TYPE *); \ @@ -171,12 +171,12 @@ Q_DECL_METATYPE_HELPER(QSizePolicy) #ifdef QT_NO_DATASTREAM # define Q_IMPL_METATYPE_HELPER(TYPE) \ - { reinterpret_cast<QMetaType::Constructor>(qConstruct##TYPE), \ - reinterpret_cast<QMetaType::Destructor>(qDestruct##TYPE) } + { reinterpret_cast<QMetaType::Creator>(qCreate##TYPE), \ + reinterpret_cast<QMetaType::Deleter>(qDelete##TYPE) } #else # define Q_IMPL_METATYPE_HELPER(TYPE) \ - { reinterpret_cast<QMetaType::Constructor>(qConstruct##TYPE), \ - reinterpret_cast<QMetaType::Destructor>(qDestruct##TYPE), \ + { reinterpret_cast<QMetaType::Creator>(qCreate##TYPE), \ + reinterpret_cast<QMetaType::Deleter>(qDelete##TYPE), \ reinterpret_cast<QMetaType::SaveOperator>(qSave##TYPE), \ reinterpret_cast<QMetaType::LoadOperator>(qLoad##TYPE) \ } |