src/dbus/qdbusinterface.cpp
branchGCC_SURGE
changeset 31 5daf16870df6
parent 30 5dc02b23752f
child 37 758a864f9613
equal deleted inserted replaced
27:93b982ccede2 31:5daf16870df6
    47 
    47 
    48 #include "qdbusmetatype_p.h"
    48 #include "qdbusmetatype_p.h"
    49 #include "qdbusinterface_p.h"
    49 #include "qdbusinterface_p.h"
    50 #include "qdbusconnection_p.h"
    50 #include "qdbusconnection_p.h"
    51 
    51 
       
    52 #ifndef QT_NO_DBUS
       
    53 
    52 QT_BEGIN_NAMESPACE
    54 QT_BEGIN_NAMESPACE
    53 
    55 
    54 static void copyArgument(void *to, int id, const QVariant &arg)
    56 static void copyArgument(void *to, int id, const QVariant &arg)
    55 {
    57 {
    56     if (id == arg.userType()) {
    58     if (id == arg.userType()) {
   256     Dispatch the call through the private.
   258     Dispatch the call through the private.
   257 */
   259 */
   258 int QDBusInterface::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
   260 int QDBusInterface::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
   259 {
   261 {
   260     _id = QDBusAbstractInterface::qt_metacall(_c, _id, _a);
   262     _id = QDBusAbstractInterface::qt_metacall(_c, _id, _a);
   261     if (_id < 0 || !d_func()->isValid)
   263     if (_id < 0 || !d_func()->isValid || !d_func()->metaObject)
   262         return _id;
   264         return _id;
   263     return d_func()->metacall(_c, _id, _a);
   265     return d_func()->metacall(_c, _id, _a);
   264 }
   266 }
   265 
   267 
   266 int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv)
   268 int QDBusInterfacePrivate::metacall(QMetaObject::Call c, int id, void **argv)
   320     }
   322     }
   321     return id;
   323     return id;
   322 }
   324 }
   323 
   325 
   324 QT_END_NAMESPACE
   326 QT_END_NAMESPACE
       
   327 
       
   328 #endif // QT_NO_DBUS