X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fbufferinfo.h;h=5e2b5f2493745b298dd8a5bc7be89d2e5c64c54a;hb=0d53027b95e4bd9ca369bd909c17cf13612f7dd5;hp=b74305490d742ba94cf0e7384257c69d7b462c5c;hpb=902c95728306e5ba115de84800fc8d5d239c9d62;p=quassel.git

diff --git a/src/common/bufferinfo.h b/src/common/bufferinfo.h
index b7430549..5e2b5f24 100644
--- a/src/common/bufferinfo.h
+++ b/src/common/bufferinfo.h
@@ -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        *
@@ -21,6 +21,7 @@
 #define _BUFFERINFO_H_
 
 #include <QtCore>
+#include "types.h"
 
 class QString;
 class QDataStream;
@@ -28,10 +29,10 @@ class QDataStream;
 class BufferInfo {
 public:
   BufferInfo();
-  BufferInfo(uint id, uint networkid, uint gid = 0, QString net = QString(), QString buf = QString());
+  BufferInfo(BufferId id, NetworkId networkid, uint gid = 0, QString net = QString(), QString buf = QString());
   
-  inline uint uid() const { return _id; }
-  inline uint networkId() const { return _netid; }
+  inline BufferId uid() const { return _id; }
+  inline NetworkId networkId() const { return _netid; }
   inline uint groupId() const { return _gid; }
   inline QString network() const { return _networkName; }
   QString buffer() const;
@@ -41,8 +42,8 @@ public:
   inline bool operator==(const BufferInfo &other) const { return _id == other._id; }
 
 private:
-  uint _id;
-  uint _netid;
+  BufferId _id;
+  NetworkId _netid;
   uint _gid;
   QString _networkName; // WILL BE REMOVED
   QString _bufferName;
@@ -54,6 +55,7 @@ private:
 
 QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo);
 QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo);
+QDebug operator<<(QDebug dbg, const BufferInfo &b);
 
 Q_DECLARE_METATYPE(BufferInfo);