[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/playground/libs/qt-dbus
From:       Thiago Macieira <thiago () kde ! org>
Date:       2006-05-07 8:33:06
Message-ID: 1146990786.046382.7770.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 538195 by thiago:

Fix demarshalling of one-element lists. Patch by Kévin Ottens.


 M  +0 -6      qdbusmarshall.cpp  


--- branches/work/kde4/playground/libs/qt-dbus/qdbusmarshall.cpp #538194:538195
@@ -62,9 +62,6 @@
     DBusMessageIter it;
     dbus_message_iter_recurse(arrayIt, &it);
 
-    if (!dbus_message_iter_has_next(&it))
-        return QDBusTypeHelper<QList<QtType> >::toVariant(list);
-
     do {
         list.append( static_cast<QtType>( qIterGet<DBusType>(&it) ) );
     } while (dbus_message_iter_next(&it));
@@ -79,9 +76,6 @@
     DBusMessageIter it;
     dbus_message_iter_recurse(arrayIt, &it);
 
-    if (!dbus_message_iter_has_next(&it))
-        return list;
-
     do {
         list.append(QString::fromUtf8(qIterGet<char *>(&it)));
     } while (dbus_message_iter_next(&it));
[prev in list] [next in list] [prev in thread] [next in thread]