made the signalproxy compile with MSVC

[quassel.git] / src / common / bufferinfo.cpp

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index 001295d..e36defc 100644 (file)
--- a/src/common/bufferinfo.cpp
+++ b/src/common/bufferinfo.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC 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  *
@@ -20,6 +20,7 @@
 
 #include <QString>
 #include <QDataStream>
+#include <QDebug>
 #include <QByteArray>
 
 #include "bufferinfo.h"
@@ -34,7 +35,7 @@ BufferInfo::BufferInfo()
     _bufferName(QString()) {
 }
 
-BufferInfo::BufferInfo(uint id, uint networkid, uint gid, QString net, QString buf)
+BufferInfo::BufferInfo(BufferId id,  NetworkId networkid, uint gid, QString net, QString buf)
   : _id(id),
     _netid(networkid),
     _gid(gid),
@@ -46,7 +47,14 @@ QString BufferInfo::buffer() const {
   if(isChannelName(_bufferName))
     return _bufferName;
   else
-    return nickFromMask(_bufferName);
+    return nickFromMask(_bufferName);  // FIXME get rid of global functions and use the Network stuff instead!
+}
+
+QDebug operator<<(QDebug dbg, const BufferInfo &b) {
+  dbg.nospace() << "(bufId: " << b.uid() << ", netId: " << b.networkId() << ", groupId: " << b.groupId()
+                << ", net: " << b.network() << ", buf: " << b.buffer() << ")";
+
+  return dbg.space();
 }
 
 QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {
@@ -63,6 +71,6 @@ QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
 }
 
 uint qHash(const BufferInfo &bufferid) {
-  return qHash(bufferid._id);
+  return qHash(bufferid._id.toInt());
 }