X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferinfo.cpp;h=fb6678f517c55cf133fec08a23209e60e6c20480;hp=57320487e0fcf2282e1d3b015fab642a74aa0ab9;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=61c8d84d1c849373e0f115dc748ed45cff95287d

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index 57320487..fb6678f5 100644
--- a/src/common/bufferinfo.cpp
+++ b/src/common/bufferinfo.cpp
@@ -28,7 +28,7 @@
 #include "util.h"
 
 BufferInfo::BufferInfo()
-  : _bufferId(0),
+    : _bufferId(0),
     _netid(0),
     _type(InvalidBuffer),
     _groupId(0),
@@ -36,8 +36,9 @@ BufferInfo::BufferInfo()
 {
 }
 
+
 BufferInfo::BufferInfo(BufferId id,  NetworkId networkid, Type type, uint gid, QString buf)
-  : _bufferId(id),
+    : _bufferId(id),
     _netid(networkid),
     _type(type),
     _groupId(gid),
@@ -45,37 +46,48 @@ BufferInfo::BufferInfo(BufferId id,  NetworkId networkid, Type type, uint gid, Q
 {
 }
 
-BufferInfo BufferInfo::fakeStatusBuffer(NetworkId networkId) {
-  return BufferInfo(0, networkId, StatusBuffer);
-}
 
-QString BufferInfo::bufferName() const {
-  if(isChannelName(_bufferName))
-    return _bufferName;
-  else
-    return nickFromMask(_bufferName);  // FIXME get rid of global functions and use the Network stuff instead!
+BufferInfo BufferInfo::fakeStatusBuffer(NetworkId networkId)
+{
+    return BufferInfo(0, networkId, StatusBuffer);
 }
 
-QDebug operator<<(QDebug dbg, const BufferInfo &b) {
-  dbg.nospace() << "(bufId: " << b.bufferId() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.bufferName() << ")";
-  return dbg.space();
+
+QString BufferInfo::bufferName() const
+{
+    if (isChannelName(_bufferName))
+        return _bufferName;
+    else
+        return nickFromMask(_bufferName);  // FIXME get rid of global functions and use the Network stuff instead!
 }
 
-QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {
-  out << bufferInfo._bufferId << bufferInfo._netid << (qint16)bufferInfo._type << bufferInfo._groupId << bufferInfo._bufferName.toUtf8();
-  return out;
+
+QDebug operator<<(QDebug dbg, const BufferInfo &b)
+{
+    dbg.nospace() << "(bufId: " << b.bufferId() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.bufferName() << ")";
+    return dbg.space();
 }
 
-QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
-  QByteArray buffername;
-  qint16 bufferType;
-  in >> bufferInfo._bufferId >> bufferInfo._netid >> bufferType >> bufferInfo._groupId >> buffername;
-  bufferInfo._type = (BufferInfo::Type)bufferType;
-  bufferInfo._bufferName = QString::fromUtf8(buffername);
-  return in;
+
+QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo)
+{
+    out << bufferInfo._bufferId << bufferInfo._netid << (qint16)bufferInfo._type << bufferInfo._groupId << bufferInfo._bufferName.toUtf8();
+    return out;
 }
 
-uint qHash(const BufferInfo &bufferid) {
-  return qHash(bufferid._bufferId);
+
+QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo)
+{
+    QByteArray buffername;
+    qint16 bufferType;
+    in >> bufferInfo._bufferId >> bufferInfo._netid >> bufferType >> bufferInfo._groupId >> buffername;
+    bufferInfo._type = (BufferInfo::Type)bufferType;
+    bufferInfo._bufferName = QString::fromUtf8(buffername);
+    return in;
 }
 
+
+uint qHash(const BufferInfo &bufferid)
+{
+    return qHash(bufferid._bufferId);
+}