X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=fe320a9640bda504626faddf387c5f5431fc302d;hp=ec34708a53980785efb57c1c4472495714bbf8d4;hb=d5095471627f6399b277d7c6d06b6bbcb915c57f;hpb=83072dd24a252b6f4baa2b40e91018929a607088 diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp index ec34708a..fe320a96 100644 --- a/src/common/syncableobject.cpp +++ b/src/common/syncableobject.cpp @@ -86,7 +86,7 @@ QVariantMap SyncableObject::toVariantMap() { // ...as well as methods, which have names starting with "init" for(int i = 0; i < meta->methodCount(); i++) { QMetaMethod method = meta->method(i); - QString methodname(::methodName(method)); + QString methodname(SignalProxy::ExtendedMetaObject::methodName(method)); if(!methodname.startsWith("init") || methodname.startsWith("initSet") || methodname.startsWith("initDone")) continue; @@ -99,7 +99,7 @@ QVariantMap SyncableObject::toVariantMap() { QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), &value); QMetaObject::invokeMethod(this, methodname.toAscii(), genericvalue); - properties[SignalProxy::methodBaseName(method)] = value; + properties[SignalProxy::ExtendedMetaObject::methodBaseName(method)] = value; } // properties["Payload"] = QByteArray(10000000, 'a'); // for testing purposes return properties;