X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferinfo.cpp;h=8d45a47d30e4e9d2120eae7115c1a25f2cb61144;hp=a68101cfce22d20ba32c210c1b330b2e74eaf47a;hb=23ebdc0a422294764ff3be3f8d7e56cc2b323185;hpb=e008cd12ef319c4b5f9fe5a8cc1524829551771d

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index a68101cf..8d45a47d 100644
--- 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  *
@@ -31,46 +31,43 @@ BufferInfo::BufferInfo()
   : _id(0),
     _netid(0),
     _gid(0),
-    _networkName(QString()),
-    _bufferName(QString()) {
+    _bufferName(QString())
+{
 }
 
-BufferInfo::BufferInfo(uint id, uint networkid, uint gid, QString net, QString buf)
+BufferInfo::BufferInfo(BufferId id,  NetworkId networkid, uint gid, QString buf)
   : _id(id),
     _netid(networkid),
     _gid(gid),
-    _networkName(net),
-    _bufferName(buf) {
+    _bufferName(buf)
+{
 }
 
 QString BufferInfo::buffer() const {
   if(isChannelName(_bufferName))
     return _bufferName;
   else
-    return nickFromMask(_bufferName);  // FIXME get rid of global functions and use the NetworkInfo stuff instead!
+    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() << ")";
-
+  dbg.nospace() << "(bufId: " << b.uid() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.buffer() << ")";
   return dbg.space();
 }
 
 QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {
-  out << bufferInfo._id << bufferInfo._netid << bufferInfo._gid << bufferInfo._networkName.toUtf8() << bufferInfo._bufferName.toUtf8();
+  out << bufferInfo._id << bufferInfo._netid << bufferInfo._gid << bufferInfo._bufferName.toUtf8();
   return out;
 }
 
 QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
-  QByteArray n, b;
-  in >> bufferInfo._id >> bufferInfo._netid >> bufferInfo._gid >> n >> b;
-  bufferInfo._networkName = QString::fromUtf8(n);
-  bufferInfo._bufferName = QString::fromUtf8(b);
+  QByteArray buffername;
+  in >> bufferInfo._id >> bufferInfo._netid >> bufferInfo._gid >> buffername;
+  bufferInfo._bufferName = QString::fromUtf8(buffername);
   return in;
 }
 
 uint qHash(const BufferInfo &bufferid) {
-  return qHash(bufferid._id);
+  return qHash(bufferid._id.toInt());
 }