summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-01 15:52:48 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-02 09:43:46 (GMT)
commit232f7af78d152518ccdcaaf1f42f89abb048ae5f (patch)
tree3722797142a3121834603d0dd3d0d6f2793b210e /tools
parent43a760280edd49382d01eb1e23ae2a08933b6bf7 (diff)
downloadQt-232f7af78d152518ccdcaaf1f42f89abb048ae5f.zip
Qt-232f7af78d152518ccdcaaf1f42f89abb048ae5f.tar.gz
Qt-232f7af78d152518ccdcaaf1f42f89abb048ae5f.tar.bz2
Replace internalPropGet and internalPropSet with the QObject versions in QDBusAbstractInterface.
They're now good enough and as fast. Reviewed-By: Marius Bugge Monsen
Diffstat (limited to 'tools')
-rw-r--r--tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp11
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;
}