Rename QMetaType::construct() to create()

create() is symmetric with destroy().

Also rename the internal methods and fields to be
consistent (qDeleteHelper already had the "right"
name, though!).

This change will allow us to use construct() and
destruct() for something else: Placement new-style
allocation (QTBUG-12574).

The old construct() is still kept for now, until
the other repositories have been updated to use
create().

Change-Id: Iceb184af6cffcb0a634359cfc3516c718ba0c2f5
Reviewed-on: http://codereview.qt-project.org/6342
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

1 files changed, 14 insertions, 10 deletions

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index f7473e337c..e65c084ae0 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -103,8 +103,8 @@ public:
         User = 256
     };
 
-    typedef void (*Destructor)(void *);
-    typedef void *(*Constructor)(const void *);
+    typedef void (*Deleter)(void *);
+    typedef void *(*Creator)(const void *);
 
 #ifndef QT_NO_DATASTREAM
     typedef void (*SaveOperator)(QDataStream &, const void *);
@@ -114,13 +114,17 @@ public:
     static void registerStreamOperators(int type, SaveOperator saveOp,
                                         LoadOperator loadOp);
 #endif
-    static int registerType(const char *typeName, Destructor destructor,
-                            Constructor constructor);
+    static int registerType(const char *typeName, Deleter deleter,
+                            Creator creator);
     static int registerTypedef(const char *typeName, int aliasId);
     static int type(const char *typeName);
     static const char *typeName(int type);
     static bool isRegistered(int type);
-    static void *construct(int type, const void *copy = 0);
+    static void *create(int type, const void *copy = 0);
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED static void *construct(int type, const void *copy = 0)
+    { return create(type, copy); }
+#endif
     static void destroy(int type, void *data);
     static void unregisterType(const char *typeName);
 
@@ -137,7 +141,7 @@ void qMetaTypeDeleteHelper(T *t)
 }
 
 template <typename T>
-void *qMetaTypeConstructHelper(const T *t)
+void *qMetaTypeCreateHelper(const T *t)
 {
     if (!t)
         return new T();
@@ -194,13 +198,13 @@ int qRegisterMetaType(const char *typeName
     if (typedefOf != -1)
         return QMetaType::registerTypedef(typeName, typedefOf);
 
-    typedef void*(*ConstructPtr)(const T*);
-    ConstructPtr cptr = qMetaTypeConstructHelper<T>;
+    typedef void*(*CreatePtr)(const T*);
+    CreatePtr cptr = qMetaTypeCreateHelper<T>;
     typedef void(*DeletePtr)(T*);
     DeletePtr dptr = qMetaTypeDeleteHelper<T>;
 
-    return QMetaType::registerType(typeName, reinterpret_cast<QMetaType::Destructor>(dptr),
-                                   reinterpret_cast<QMetaType::Constructor>(cptr));
+    return QMetaType::registerType(typeName, reinterpret_cast<QMetaType::Deleter>(dptr),
+                                   reinterpret_cast<QMetaType::Creator>(cptr));
 }
 
 #ifndef QT_NO_DATASTREAM