X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferinfo.cpp;h=3aae625ce52eb136f2566fcd8082d68d9c9f785d;hp=57320487e0fcf2282e1d3b015fab642a74aa0ab9;hb=579e559a6322209df7cd51c34801fecff5fe734b;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index 57320487..3aae625c 100644
--- a/src/common/bufferinfo.cpp
+++ b/src/common/bufferinfo.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,67 +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()
-  : _bufferId(0),
-    _netid(0),
-    _type(InvalidBuffer),
-    _groupId(0),
-    _bufferName(QString())
-{
-}
+    : _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(BufferId id,  NetworkId networkid, Type type, uint gid, QString buf)
-  : _bufferId(id),
-    _netid(networkid),
-    _type(type),
-    _groupId(gid),
-    _bufferName(buf)
+BufferInfo BufferInfo::fakeStatusBuffer(NetworkId networkId)
 {
+    return BufferInfo(0, networkId, StatusBuffer);
 }
 
-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!
 }
 
-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!
+bool BufferInfo::acceptsRegularMessages() const
+{
+    if (_type == StatusBuffer || _type == InvalidBuffer)
+        return false;
+    return true;
 }
 
-QDebug operator<<(QDebug dbg, const BufferInfo &b) {
-  dbg.nospace() << "(bufId: " << b.bufferId() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.bufferName() << ")";
-  return dbg.space();
+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 &out, const BufferInfo &bufferInfo) {
-  out << bufferInfo._bufferId << bufferInfo._netid << (qint16)bufferInfo._type << bufferInfo._groupId << bufferInfo._bufferName.toUtf8();
-  return out;
+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) {
-  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& 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);
+uint qHash(const BufferInfo& bufferid)
+{
+    return qHash(bufferid._bufferId);
 }
-