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

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index a68101cf..e36defcf 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  *
@@ -35,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),
@@ -47,7 +47,7 @@ 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) {
@@ -71,6 +71,6 @@ QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
 }
 
 uint qHash(const BufferInfo &bufferid) {
-  return qHash(bufferid._id);
+  return qHash(bufferid._id.toInt());
 }