qa: Replace deprecated qVariantFromValue() by QVariant::fromValue()

[quassel.git] / src / common / messageevent.h

diff --git a/src/common/messageevent.h b/src/common/messageevent.h
index f2bc6d1..f8d636f 100644 (file)
--- a/src/common/messageevent.h
+++ b/src/common/messageevent.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 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,11 +15,12 @@
  *   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.         *
  ***************************************************************************/
 
-#ifndef MESSAGEEVENT_H
-#define MESSAGEEVENT_H
+#pragma once
+
+#include "common-export.h"
 
 #include "message.h"
 #include "networkevent.h"
@@ -27,51 +28,54 @@
 // this corresponds to CoreSession::RawMessage for now and should contain the information we need to convert events
 // into messages for the legacy code to work with
 
-class MessageEvent : public NetworkEvent {
-
+class COMMON_EXPORT MessageEvent : public NetworkEvent
+{
 public:
-  explicit MessageEvent(Message::Type msgType,
-                        Network *network,
-                        const QString &msg,
-                        const QString &sender = QString(),
-                        const QString &target = QString(),
-                        Message::Flags msgFlags = Message::None,
-                        const QDateTime &timestamp = QDateTime()
-                        );
+    explicit MessageEvent(Message::Type msgType,
+                          Network* network,
+                          QString msg,
+                          QString sender = {},
+                          QString target = {},
+                          Message::Flags msgFlags = Message::None,
+                          const QDateTime& timestamp = {});
+
+    inline Message::Type msgType() const { return _msgType; }
+    inline void setMsgType(Message::Type type) { _msgType = type; }
 
-  inline Message::Type msgType() const { return _msgType; }
-  inline void setMsgType(Message::Type type) { _msgType = type; }
+    inline BufferInfo::Type bufferType() const { return _bufferType; }
+    inline void setBufferType(BufferInfo::Type type) { _bufferType = type; }
 
-  inline BufferInfo::Type bufferType() const { return _bufferType; }
-  inline void setBufferType(BufferInfo::Type type) { _bufferType = type; }
+    inline QString target() const { return _target; }
+    inline QString text() const { return _text; }
+    inline QString sender() const { return _sender; }
 
-  inline QString target() const { return _target; }
-  inline QString text() const { return _text; }
-  inline QString sender() const { return _sender; }
+    inline Message::Flags msgFlags() const { return _msgFlags; }
+    inline void setMsgFlag(Message::Flag flag) { _msgFlags |= flag; }
+    inline void setMsgFlags(Message::Flags flags) { _msgFlags = flags; }
 
-  inline Message::Flags msgFlags() const { return _msgFlags; }
-  inline void setMsgFlag(Message::Flag flag) { _msgFlags |= flag; }
-  inline void setMsgFlags(Message::Flags flags) { _msgFlags = flags; }
+    static Event* create(EventManager::EventType type, QVariantMap& map, Network* network);
 
 protected:
-  virtual inline QString className() const { return "MessageEvent"; }
-  virtual inline void debugInfo(QDebug &dbg) const {
-    NetworkEvent::debugInfo(dbg);
-    dbg.nospace() << ", sender = " << qPrintable(sender())
-                  << ", target = " << qPrintable(target())
-                  << ", text = " << text()
-                  << ", msgtype = " << qPrintable(QString::number(msgType(), 16))
-                  << ", buffertype = " << qPrintable(QString::number(bufferType(), 16))
-                  << ", msgflags = " << qPrintable(QString::number(msgFlags(), 16));
-  }
+    explicit MessageEvent(EventManager::EventType type, QVariantMap& map, Network* network);
+    void toVariantMap(QVariantMap& map) const override;
+
+    inline QString className() const override { return "MessageEvent"; }
+    inline void debugInfo(QDebug& dbg) const override
+    {
+        NetworkEvent::debugInfo(dbg);
+        dbg.nospace() << ", sender = " << qPrintable(sender())
+                      << ", target = " << qPrintable(target())
+                      << ", text = " << text()
+                      << ", msgtype = " << qPrintable(QString::number(msgType(), 16))
+                      << ", buffertype = " << qPrintable(QString::number(bufferType(), 16))
+                      << ", msgflags = " << qPrintable(QString::number(msgFlags(), 16));
+    }
 
 private:
-  BufferInfo::Type bufferTypeByTarget(const QString &target) const;
+    BufferInfo::Type bufferTypeByTarget(const QString& target) const;
 
-  Message::Type _msgType;
-  BufferInfo::Type _bufferType;
-  QString _text, _sender, _target;
-  Message::Flags _msgFlags;
+    Message::Type _msgType;
+    BufferInfo::Type _bufferType;
+    QString _text, _sender, _target;
+    Message::Flags _msgFlags;
 };
-
-#endif