X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsyncableobject.cpp;h=f43a155cf1883cda1d5fb7aebffeb0944e853f06;hp=ba05014f336c6e4f53422156aeaa0e612a664b8e;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a

diff --git a/src/common/syncableobject.cpp b/src/common/syncableobject.cpp
index ba05014f..f43a155c 100644
--- a/src/common/syncableobject.cpp
+++ b/src/common/syncableobject.cpp
@@ -27,19 +27,14 @@
 #include "signalproxy.h"
 #include "util.h"
 
-INIT_SYNCABLE_OBJECT(SyncableObject)
 SyncableObject::SyncableObject(QObject *parent)
-    : QObject(parent),
-    _initialized(false),
-    _allowClientUpdates(false)
+    : QObject(parent)
 {
 }
 
 
 SyncableObject::SyncableObject(const QString &objectName, QObject *parent)
-    : QObject(parent),
-    _initialized(false),
-    _allowClientUpdates(false)
+    : QObject(parent)
 {
     setObjectName(objectName);
 }
@@ -118,7 +113,7 @@ QVariantMap SyncableObject::toVariantMap()
             continue;
         }
 
-        QVariant value(variantType, (const void *)0);
+        QVariant value(variantType, (const void *)nullptr);
         QGenericReturnArgument genericvalue = QGenericReturnArgument(method.typeName(), value.data());
         QMetaObject::invokeMethod(this, methodname.toLatin1(), genericvalue);