3 files changed, 23 insertions, 31 deletions

diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp
index 927f740935..11fed281b7 100644
--- a/src/qml/util/qqmladaptormodel.cpp
+++ b/src/qml/util/qqmladaptormodel.cpp
@@ -102,8 +102,8 @@ public:
     virtual QVariant value(int role) const = 0;
     virtual void setValue(int role, const QVariant &value) = 0;
 
-    void setValue(const QString &role, const QVariant &value);
-    bool resolveIndex(const QQmlAdaptorModel &model, int idx);
+    void setValue(const QString &role, const QVariant &value) override;
+    bool resolveIndex(const QQmlAdaptorModel &model, int idx) override;
 
     static QV4::ReturnedValue get_property(QV4::CallContext *ctx, uint propertyId);
     static QV4::ReturnedValue set_property(QV4::CallContext *ctx, uint propertyId);
@@ -140,7 +140,7 @@ public:
             const QList<QQmlDelegateModelItem *> &items,
             int index,
             int count,
-            const QVector<int> &roles) const
+            const QVector<int> &roles) const override
     {
         bool changed = roles.isEmpty() && !watchedRoles.isEmpty();
         if (!changed && !watchedRoles.isEmpty() && watchedRoleIds.isEmpty()) {
@@ -184,7 +184,7 @@ public:
     void replaceWatchedRoles(
             QQmlAdaptorModel &,
             const QList<QByteArray> &oldRoles,
-            const QList<QByteArray> &newRoles) const
+            const QList<QByteArray> &newRoles) const override
     {
         VDMModelDelegateDataType *dataType = const_cast<VDMModelDelegateDataType *>(this);
 
@@ -237,12 +237,12 @@ public:
 
     // QAbstractDynamicMetaObject
 
-    void objectDestroyed(QObject *)
+    void objectDestroyed(QObject *) override
     {
         release();
     }
 
-    int metaCall(QObject *object, QMetaObject::Call call, int id, void **arguments)
+    int metaCall(QObject *object, QMetaObject::Call call, int id, void **arguments) override
     {
         return static_cast<QQmlDMCachedModelData *>(object)->metaCall(call, id, arguments);
     }
@@ -413,18 +413,18 @@ public:
         }
     }
 
-    QVariant value(int role) const
+    QVariant value(int role) const override
     {
         return type->model->aim()->index(index, 0, type->model->rootIndex).data(role);
     }
 
-    void setValue(int role, const QVariant &value)
+    void setValue(int role, const QVariant &value) override
     {
         type->model->aim()->setData(
                 type->model->aim()->index(index, 0, type->model->rootIndex), value, role);
     }
 
-    QV4::ReturnedValue get()
+    QV4::ReturnedValue get() override
     {
         if (type->prototype.isUndefined()) {
             QQmlAdaptorModelEngineData * const data = engineData(v4);
@@ -515,7 +515,7 @@ public:
     QQmlDelegateModelItem *createItem(
             QQmlAdaptorModel &model,
             QQmlDelegateModelItemMetaType *metaType,
-            int index) const Q_DECL_OVERRIDE
+            int index) const override
     {
         VDMAbstractItemModelDataType *dataType = const_cast<VDMAbstractItemModelDataType *>(this);
         if (!metaObject)
@@ -601,7 +601,7 @@ public:
         RETURN_RESULT(QV4::Encode::undefined());
     }
 
-    QV4::ReturnedValue get()
+    QV4::ReturnedValue get() override
     {
         QQmlAdaptorModelEngineData *data = engineData(v4);
         QV4::Scope scope(v4);
@@ -612,13 +612,13 @@ public:
         return o.asReturnedValue();
     }
 
-    void setValue(const QString &role, const QVariant &value)
+    void setValue(const QString &role, const QVariant &value) override
     {
         if (role == QLatin1String("modelData"))
             cachedData = value;
     }
 
-    bool resolveIndex(const QQmlAdaptorModel &model, int idx)
+    bool resolveIndex(const QQmlAdaptorModel &model, int idx) override
     {
         if (index == -1) {
             index = idx;
@@ -660,7 +660,7 @@ public:
     QQmlDelegateModelItem *createItem(
             QQmlAdaptorModel &model,
             QQmlDelegateModelItemMetaType *metaType,
-            int index) const Q_DECL_OVERRIDE
+            int index) const override
     {
         return new QQmlDMListAccessorData(
                 metaType,
@@ -687,7 +687,7 @@ public:
             QObject *object);
 
     QObject *modelData() const { return object; }
-    QObject *proxiedObject() { return object; }
+    QObject *proxiedObject() override { return object; }
 
     QPointer<QObject> object;
 };
@@ -744,7 +744,7 @@ public:
     QQmlDelegateModelItem *createItem(
             QQmlAdaptorModel &model,
             QQmlDelegateModelItemMetaType *metaType,
-            int index) const Q_DECL_OVERRIDE
+            int index) const override
     {
         VDMObjectDelegateDataType *dataType = const_cast<VDMObjectDelegateDataType *>(this);
         if (!metaObject)
@@ -785,7 +785,7 @@ public:
         m_type->release();
     }
 
-    int metaCall(QObject *o, QMetaObject::Call call, int id, void **arguments)
+    int metaCall(QObject *o, QMetaObject::Call call, int id, void **arguments) override
     {
         Q_ASSERT(o == m_data);
         Q_UNUSED(o);
@@ -806,7 +806,7 @@ public:
         }
     }
 
-    int createProperty(const char *name, const char *)
+    int createProperty(const char *name, const char *) override
     {
         if (!m_data->object)
             return -1;
diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp
index 6e6554f2c3..b54e8d901a 100644
--- a/src/qml/util/qqmlpropertymap.cpp
+++ b/src/qml/util/qqmlpropertymap.cpp
@@ -186,9 +186,8 @@ int QQmlPropertyMapMetaObject::createProperty(const char *name, const char *valu
     Constructs a bindable map with parent object \a parent.
 */
 QQmlPropertyMap::QQmlPropertyMap(QObject *parent)
-: QObject(*allocatePrivate(), parent)
+: QQmlPropertyMap(&staticMetaObject, parent)
 {
-    init(metaObject());
 }
 
 /*!
@@ -339,18 +338,13 @@ QVariant QQmlPropertyMap::updateValue(const QString &key, const QVariant &input)
 }
 
 /*! \internal */
-void QQmlPropertyMap::init(const QMetaObject *staticMetaObject)
+QQmlPropertyMap::QQmlPropertyMap(const QMetaObject *staticMetaObject, QObject *parent)
+    : QObject(*(new QQmlPropertyMapPrivate), parent)
 {
     Q_D(QQmlPropertyMap);
     d->mo = new QQmlPropertyMapMetaObject(this, d, staticMetaObject);
 }
 
-/*! \internal */
-QObjectPrivate *QQmlPropertyMap::allocatePrivate()
-{
-    return new QQmlPropertyMapPrivate;
-}
-
 /*!
     \fn void QQmlPropertyMap::valueChanged(const QString &key, const QVariant &value)
     This signal is emitted whenever one of the values in the map is changed. \a key
diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h
index 01048f3662..8c5ecce48e 100644
--- a/src/qml/util/qqmlpropertymap.h
+++ b/src/qml/util/qqmlpropertymap.h
@@ -80,15 +80,13 @@ protected:
 
     template<class DerivedType>
     QQmlPropertyMap(DerivedType *derived, QObject *parentObj)
-        : QObject(*allocatePrivate(), parentObj)
+        : QQmlPropertyMap(&DerivedType::staticMetaObject, parentObj)
     {
         Q_UNUSED(derived)
-        init(&DerivedType::staticMetaObject);
     }
 
 private:
-    void init(const QMetaObject *staticMetaObject);
-    static QObjectPrivate *allocatePrivate();
+    QQmlPropertyMap(const QMetaObject *staticMetaObject, QObject *parent);
 
     Q_DECLARE_PRIVATE(QQmlPropertyMap)
     Q_DISABLE_COPY(QQmlPropertyMap)