From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 27 Mar 2012 20:02:21 +0000 (+0200)
Subject: Properly register the Network::ConnectionState enum
X-Git-Tag: 0.9-beta1~83
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=8a0b44b52a6a0a855a832fa7b46f3631a8684a3f;hp=79a8a98f5a499c2da6c1e57855e9c7b2815ec6d4

Properly register the Network::ConnectionState enum

The Q_ENUMS declaration was, uhm, creative, and additionally Q_ENUMS are automatically
registered with the QMetaType system, so no need for registering them again. Actually,
while this somehow works in Qt4, Qt5 barfs with an assert.
---

diff --git a/src/common/network.h b/src/common/network.h
index c202ede1..6b126d83 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -47,7 +47,7 @@ struct NetworkInfo;
 class Network : public SyncableObject {
   SYNCABLE_OBJECT
   Q_OBJECT
-  Q_ENUMS(ConnectionState Network::ConnectionState)
+  Q_ENUMS(ConnectionState)
 
   Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false)
   Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false)
diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index db56043b..eb854b30 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -161,14 +161,12 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaType<NetworkInfo>("NetworkInfo");
   qRegisterMetaType<Network::Server>("Network::Server");
   qRegisterMetaType<Identity>("Identity");
-  qRegisterMetaType<Network::ConnectionState>("Network::ConnectionState");
 
   qRegisterMetaTypeStreamOperators<Message>("Message");
   qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
   qRegisterMetaTypeStreamOperators<NetworkInfo>("NetworkInfo");
   qRegisterMetaTypeStreamOperators<Network::Server>("Network::Server");
   qRegisterMetaTypeStreamOperators<Identity>("Identity");
-  qRegisterMetaTypeStreamOperators<qint8>("Network::ConnectionState");
 
   qRegisterMetaType<IdentityId>("IdentityId");
   qRegisterMetaType<BufferId>("BufferId");