[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-19 14:06:29
Message-ID: 1148047589.004722.24517.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 542512 by thiago:

Make it find the adaptors: this has been broken since we made the adaptors and the \
connector sibling objects

 M  +4 -5      qdbusabstractadaptor.cpp  


--- branches/work/kde4/playground/libs/qt-dbus/qdbusabstractadaptor.cpp \
#542511:542512 @@ -242,12 +242,11 @@
         return;                 // avoid working multiple times if multiple adaptors \
were added  
     waitingForPolish = false;
-    const QObjectList &objs = children();
+    const QObjectList &objs = parent()->children();
     foreach (QObject *obj, objs) {
-        Q_ASSERT(qobject_cast<QDBusAbstractAdaptor *>(obj));
-
-        QDBusAbstractAdaptor *adaptor = static_cast<QDBusAbstractAdaptor *>(obj);
-        addAdaptor(adaptor);
+        QDBusAbstractAdaptor *adaptor = qobject_cast<QDBusAbstractAdaptor *>(obj);
+        if (adaptor)
+            addAdaptor(adaptor);
     }
 
     // sort the adaptor list


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