Replace internalPropGet and internalPropSet with the QObject versions in QDBusAbstractInterface.

They're now good enough and as fast.

Reviewed-By: Marius Bugge Monsen

2 files changed, 12 insertions, 15 deletions

diff --git a/tests/auto/qdbusabstractinterface/pinger.h b/tests/auto/qdbusabstractinterface/pinger.h
index 6e92e65..fb8adda 100644
--- a/tests/auto/qdbusabstractinterface/pinger.h
+++ b/tests/auto/qdbusabstractinterface/pinger.h
@@ -49,8 +49,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef PINGER_H_1246460303
-#define PINGER_H_1246460303
+#ifndef PINGER_H_1246463415
+#define PINGER_H_1246463415
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -79,21 +79,21 @@ public:
 
     Q_PROPERTY(RegisteredType complexProp READ complexProp WRITE setComplexProp)
     inline RegisteredType complexProp() const
-    { return qvariant_cast< RegisteredType >(internalPropGet("complexProp")); }
+    { return qvariant_cast< RegisteredType >(property("complexProp")); }
     inline void setComplexProp(RegisteredType value)
-    { internalPropSet("complexProp", qVariantFromValue(value)); }
+    { setProperty("complexProp", qVariantFromValue(value)); }
 
     Q_PROPERTY(QString stringProp READ stringProp WRITE setStringProp)
     inline QString stringProp() const
-    { return qvariant_cast< QString >(internalPropGet("stringProp")); }
+    { return qvariant_cast< QString >(property("stringProp")); }
     inline void setStringProp(const QString &value)
-    { internalPropSet("stringProp", qVariantFromValue(value)); }
+    { setProperty("stringProp", qVariantFromValue(value)); }
 
     Q_PROPERTY(QDBusVariant variantProp READ variantProp WRITE setVariantProp)
     inline QDBusVariant variantProp() const
-    { return qvariant_cast< QDBusVariant >(internalPropGet("variantProp")); }
+    { return qvariant_cast< QDBusVariant >(property("variantProp")); }
     inline void setVariantProp(const QDBusVariant &value)
-    { internalPropSet("variantProp", qVariantFromValue(value)); }
+    { setProperty("variantProp", qVariantFromValue(value)); }
 
 public Q_SLOTS: // METHODS
     inline QDBusPendingReply<RegisteredType> complexMethod()
diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
index 5d1ac32..b8b9338 100644
--- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -613,18 +613,15 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
 
             // getter:
             if (property.access != QDBusIntrospection::Property::Write) {
-                hs << "    inline " << type << " " << getter << "() const" << endl;
-                if (type != "QVariant")
-                    hs << "    { return qvariant_cast< " << type << " >(internalPropGet(\""
-                       << property.name << "\")); }" << endl;
-                else
-                    hs << "    { return internalPropGet(\"" << property.name << "\"); }" << endl;
+                hs << "    inline " << type << " " << getter << "() const" << endl
+                    << "    { return qvariant_cast< " << type << " >(property(\""
+                    << property.name << "\")); }" << endl;
             }
 
             // setter:
             if (property.access != QDBusIntrospection::Property::Read) {
                 hs << "    inline void " << setter << "(" << constRefArg(type) << "value)" << endl
-                   << "    { internalPropSet(\"" << property.name
+                   << "    { setProperty(\"" << property.name
                    << "\", qVariantFromValue(value)); }" << endl;
             }