X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.cpp;h=09aa5902aa63c1637b2be50da6de69ad7d580f73;hp=ed2d1df8b78ec2fa5f50edd3e6f716cdf9539eee;hb=b797e5f581b10a517c30f78cb53f813af741e261;hpb=d064f62ec2f316f17c3aac3c31184376380ef098

diff --git a/src/common/global.cpp b/src/common/global.cpp
index ed2d1df8..09aa5902 100644
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -18,12 +18,15 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include <QObject>
-#include <QStringList>
+#include <QMetaType>
 
 #include "global.h"
 #include "logger.h"
 #include "message.h"
-#include "util.h"
+#include "identity.h"
+#include "bufferinfo.h"
+#include "types.h"
+#include "syncableobject.h"
 
 extern void messageHandler(QtMsgType type, const char *msg);
 
@@ -46,47 +49,6 @@ void Global::initIconMap() {
 }
 */
 
-/**************************************************************************************/
-BufferId::BufferId()
-  : _id(0),
-    _netid(0),
-    _gid(0),
-    _networkName(QString()),
-    _bufferName(QString()) {
-}
-
-BufferId::BufferId(uint id, uint networkid, uint gid, QString net, QString buf)
-  : _id(id),
-    _netid(networkid),
-    _gid(gid),
-    _networkName(net),
-    _bufferName(buf) {
-}
-
-QString BufferId::buffer() const {
-  if(isChannelName(_bufferName))
-    return _bufferName;
-  else
-    return nickFromMask(_bufferName);
-}
-
-QDataStream &operator<<(QDataStream &out, const BufferId &bufferId) {
-  out << bufferId._id << bufferId._netid << bufferId._gid << bufferId._networkName.toUtf8() << bufferId._bufferName.toUtf8();
-  return out;
-}
-
-QDataStream &operator>>(QDataStream &in, BufferId &bufferId) {
-  QByteArray n, b;
-  in >> bufferId._id >> bufferId._netid >> bufferId._gid >> n >> b;
-  bufferId._networkName = QString::fromUtf8(n);
-  bufferId._bufferName = QString::fromUtf8(b);
-  return in;
-}
-
-uint qHash(const BufferId &bufferid) {
-  return qHash(bufferid._id);
-}
-
 /**
  * Retrieves an icon determined by its symbolic name. The mapping shall later
  * be performed by a theme manager or something like that.
@@ -100,5 +62,33 @@ uint qHash(const BufferId &bufferid) {
 //  return 0;
 //}
 
+//! Register our custom types with Qt's Meta Object System.
+/**  This makes them available for QVariant and in signals/slots, among other things.
+ */
+void Global::registerMetaTypes() {
+  // Complex types
+  qRegisterMetaType<QVariant>("QVariant");
+  qRegisterMetaType<Message>("Message");
+  qRegisterMetaType<BufferInfo>("BufferInfo");
+  qRegisterMetaType<Identity>("Identity");
+
+  qRegisterMetaTypeStreamOperators<QVariant>("QVariant");
+  qRegisterMetaTypeStreamOperators<Message>("Message");
+  qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
+  qRegisterMetaTypeStreamOperators<Identity>("Identity");
+
+  // Basic types (typedefs)
+  // These use the standard stream operators
+  qRegisterMetaType<IdentityId>("IdentityId");
+  qRegisterMetaType<BufferId>("BufferId");
+  qRegisterMetaType<NetworkId>("NetworkId");
+
+  qRegisterMetaTypeStreamOperators<IdentityId>("IdentityId");
+  qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
+  qRegisterMetaTypeStreamOperators<NetworkId>("NetworkId");
+
+}
+
 Global::RunMode Global::runMode;
-QString Global::quasselDir;
+uint Global::defaultPort;
+