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

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index a68101cf..f9c01c04 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-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,62 +15,78 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QString>
+#include "bufferinfo.h"
+
+#include <utility>
+
+#include <QByteArray>
 #include <QDataStream>
 #include <QDebug>
-#include <QByteArray>
-
-#include "bufferinfo.h"
+#include <QString>
 
 #include "util.h"
 
 BufferInfo::BufferInfo()
-  : _id(0),
-    _netid(0),
-    _gid(0),
-    _networkName(QString()),
-    _bufferName(QString()) {
-}
+    : _bufferId(0)
+    , _netid(0)
+    , _bufferName(QString())
+{}
 
-BufferInfo::BufferInfo(uint id, uint networkid, uint gid, QString net, QString buf)
-  : _id(id),
-    _netid(networkid),
-    _gid(gid),
-    _networkName(net),
-    _bufferName(buf) {
-}
+BufferInfo::BufferInfo(BufferId id, NetworkId networkid, Type type, uint gid, QString buf)
+    : _bufferId(id)
+    , _netid(networkid)
+    , _type(type)
+    , _groupId(gid)
+    , _bufferName(std::move(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!
+BufferInfo BufferInfo::fakeStatusBuffer(NetworkId networkId)
+{
+    return BufferInfo(0, networkId, StatusBuffer);
 }
 
-QDebug operator<<(QDebug dbg, const BufferInfo &b) {
-  dbg.nospace() << "(bufId: " << b.uid() << ", netId: " << b.networkId() << ", groupId: " << b.groupId()
-                << ", net: " << b.network() << ", buf: " << b.buffer() << ")";
+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!
+}
 
-  return dbg.space();
+bool BufferInfo::acceptsRegularMessages() const
+{
+    if (_type == StatusBuffer || _type == InvalidBuffer)
+        return false;
+    return true;
 }
 
-QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {
-  out << bufferInfo._id << bufferInfo._netid << bufferInfo._gid << bufferInfo._networkName.toUtf8() << 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 n, b;
-  in >> bufferInfo._id >> bufferInfo._netid >> bufferInfo._gid >> n >> b;
-  bufferInfo._networkName = QString::fromUtf8(n);
-  bufferInfo._bufferName = QString::fromUtf8(b);
-  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._id);
+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);
+}