X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferinfo.cpp;h=3aae625ce52eb136f2566fcd8082d68d9c9f785d;hp=ae569efaad3f65db48c2aa1c478b524f451ab896;hb=e38846f054ad1766f2e91992a57bbaffd33c7c06;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index ae569efa..3aae625c 100644
--- a/src/common/bufferinfo.cpp
+++ b/src/common/bufferinfo.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,41 +18,36 @@
  *   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()
-    : _bufferId(0),
-    _netid(0),
-    _type(InvalidBuffer),
-    _groupId(0),
-    _bufferName(QString())
-{
-}
-
-
-BufferInfo::BufferInfo(BufferId id,  NetworkId networkid, Type type, uint gid, QString buf)
-    : _bufferId(id),
-    _netid(networkid),
-    _type(type),
-    _groupId(gid),
-    _bufferName(buf)
-{
-}
-
+    : _bufferId(0)
+    , _netid(0)
+    , _bufferName(QString())
+{}
+
+BufferInfo::BufferInfo(BufferId id, NetworkId networkid, Type type, uint gid, QString buf)
+    : _bufferId(id)
+    , _netid(networkid)
+    , _type(type)
+    , _groupId(gid)
+    , _bufferName(std::move(buf))
+{}
 
 BufferInfo BufferInfo::fakeStatusBuffer(NetworkId networkId)
 {
     return BufferInfo(0, networkId, StatusBuffer);
 }
 
-
 QString BufferInfo::bufferName() const
 {
     if (isChannelName(_bufferName))
@@ -61,22 +56,27 @@ QString BufferInfo::bufferName() const
         return nickFromMask(_bufferName);  // FIXME get rid of global functions and use the Network stuff instead!
 }
 
+bool BufferInfo::acceptsRegularMessages() const
+{
+    if (_type == StatusBuffer || _type == InvalidBuffer)
+        return false;
+    return true;
+}
 
-QDebug operator<<(QDebug dbg, const BufferInfo &b)
+QDebug operator<<(QDebug dbg, const BufferInfo& b)
 {
-    dbg.nospace() << "(bufId: " << b.bufferId() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.bufferName() << ")";
+    dbg.nospace() << "(bufId: " << b.bufferId() << ", netId: " << b.networkId() << ", groupId: " << b.groupId()
+                  << ", buf: " << b.bufferName() << ")";
     return dbg.space();
 }
 
-
-QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo)
+QDataStream& operator<<(QDataStream& out, const BufferInfo& bufferInfo)
 {
     out << bufferInfo._bufferId << bufferInfo._netid << (qint16)bufferInfo._type << bufferInfo._groupId << bufferInfo._bufferName.toUtf8();
     return out;
 }
 
-
-QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo)
+QDataStream& operator>>(QDataStream& in, BufferInfo& bufferInfo)
 {
     QByteArray buffername;
     qint16 bufferType;
@@ -86,8 +86,7 @@ QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo)
     return in;
 }
 
-
-uint qHash(const BufferInfo &bufferid)
+uint qHash(const BufferInfo& bufferid)
 {
     return qHash(bufferid._bufferId);
 }