X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.cpp;h=300d182778cbdc6afd36ba953242b5eebd23dd0c;hp=ce71aeb0fbf26cf47e2e7124d54cd42866f40b86;hb=351e8bd985011abf721e2beffd9b8eeee74bf4e1;hpb=d1b6499b0b848d4287efae89107576548533502c diff --git a/src/common/global.cpp b/src/common/global.cpp index ce71aeb0..300d1827 100644 --- a/src/common/global.cpp +++ b/src/common/global.cpp @@ -24,6 +24,7 @@ #include "logger.h" #include "message.h" #include "identity.h" +#include "network.h" #include "bufferinfo.h" #include "types.h" #include "syncableobject.h" @@ -71,24 +72,30 @@ void Global::registerMetaTypes() { qRegisterMetaType("QVariant"); qRegisterMetaType("Message"); qRegisterMetaType("BufferInfo"); + qRegisterMetaType("NetworkInfo"); qRegisterMetaType("Identity"); + qRegisterMetaType("Network::ConnectionState"); qRegisterMetaTypeStreamOperators("QVariant"); qRegisterMetaTypeStreamOperators("Message"); qRegisterMetaTypeStreamOperators("BufferInfo"); + qRegisterMetaTypeStreamOperators("NetworkInfo"); qRegisterMetaTypeStreamOperators("Identity"); + qRegisterMetaTypeStreamOperators("Network::ConnectionState"); - // Basic types (typedefs) - // These use the standard stream operators qRegisterMetaType("IdentityId"); qRegisterMetaType("BufferId"); qRegisterMetaType("NetworkId"); qRegisterMetaType("UserId"); + qRegisterMetaType("AccountId"); + qRegisterMetaType("MsgId"); qRegisterMetaTypeStreamOperators("IdentityId"); qRegisterMetaTypeStreamOperators("BufferId"); qRegisterMetaTypeStreamOperators("NetworkId"); qRegisterMetaTypeStreamOperators("UserId"); + qRegisterMetaTypeStreamOperators("AccountId"); + qRegisterMetaTypeStreamOperators("MsgId"); } @@ -104,3 +111,5 @@ QString Global::coreVersionNeeded; Global::RunMode Global::runMode; uint Global::defaultPort; + +bool Global::SPUTDEV;