X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmessageevent.h;h=f8d636fd08730306de3e454393bae3a42edbe455;hp=8c1e396fc6067ea67a6e325bae11a96f8381e8a3;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf diff --git a/src/common/messageevent.h b/src/common/messageevent.h index 8c1e396f..f8d636fd 100644 --- a/src/common/messageevent.h +++ b/src/common/messageevent.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 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,8 +18,9 @@ * 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,17 +28,16 @@ // 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 ×tamp = QDateTime() - ); + 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; } @@ -53,14 +53,14 @@ public: 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); + static Event* create(EventManager::EventType type, QVariantMap& map, Network* network); protected: - explicit MessageEvent(EventManager::EventType type, QVariantMap &map, Network *network); - void toVariantMap(QVariantMap &map) const; + explicit MessageEvent(EventManager::EventType type, QVariantMap& map, Network* network); + void toVariantMap(QVariantMap& map) const override; - virtual inline QString className() const { return "MessageEvent"; } - virtual inline void debugInfo(QDebug &dbg) const + inline QString className() const override { return "MessageEvent"; } + inline void debugInfo(QDebug& dbg) const override { NetworkEvent::debugInfo(dbg); dbg.nospace() << ", sender = " << qPrintable(sender()) @@ -71,15 +71,11 @@ protected: << ", 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; }; - - -#endif