Merge branch 'research/qdbus-improvements'

1 files changed, 4 insertions, 7 deletions

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;
             }