summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-22 15:37:19 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-22 15:37:19 (GMT)
commitd63f3c4c3940b4293c8763d5bfc01ed430075efb (patch)
treeab648417305e42ffb65f86d272ffccb023a152f1 /src/dbus
parent3597a5b82610752cf95372a5a5f7b33afc8d30b9 (diff)
parent7a208874ae5d69d2b70b08f03675ef8f0c843a7f (diff)
downloadQt-d63f3c4c3940b4293c8763d5bfc01ed430075efb.zip
Qt-d63f3c4c3940b4293c8763d5bfc01ed430075efb.tar.gz
Qt-d63f3c4c3940b4293c8763d5bfc01ed430075efb.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbusmarshaller.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp
index bb7fa6b..7207b4c 100644
--- a/src/dbus/qdbusmarshaller.cpp
+++ b/src/dbus/qdbusmarshaller.cpp
@@ -397,16 +397,6 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
case DBUS_TYPE_DOUBLE:
qIterAppend(&iterator, ba, *signature, arg.constData());
return true;
-
- case DBUS_TYPE_STRING:
- case DBUS_TYPE_OBJECT_PATH:
- case DBUS_TYPE_SIGNATURE: {
- const QByteArray data =
- reinterpret_cast<const QString *>(arg.constData())->toUtf8();
- const char *rawData = data.constData();
- qIterAppend(&iterator, ba, *signature, &rawData);
- return true;
- }
#else
case DBUS_TYPE_BYTE:
append( qvariant_cast<uchar>(arg) );
@@ -435,6 +425,8 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
case DBUS_TYPE_DOUBLE:
append( arg.toDouble() );
return true;
+#endif
+
case DBUS_TYPE_STRING:
append( arg.toString() );
return true;
@@ -444,7 +436,6 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
case DBUS_TYPE_SIGNATURE:
append( qvariant_cast<QDBusSignature>(arg) );
return true;
-#endif
// compound types:
case DBUS_TYPE_VARIANT: