X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent.h;h=97d13e24d7c0c56368699f85a9c6e4dcaa0bda3f;hp=23aaa10be99046435746a3c3aafcdc5f20d9bc2d;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222 diff --git a/src/common/event.h b/src/common/event.h index 23aaa10b..97d13e24 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -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,8 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef EVENT_H -#define EVENT_H +#pragma once + +#include "common-export.h" #include #include @@ -28,11 +29,11 @@ class Network; -class Event +class COMMON_EXPORT Event { public: explicit Event(EventManager::EventType type = EventManager::Invalid); - virtual ~Event() {} + virtual ~Event() = default; inline EventManager::EventType type() const { return _type; } @@ -45,25 +46,25 @@ public: inline void stop() { setFlag(EventManager::Stopped); } inline bool isStopped() { return _flags.testFlag(EventManager::Stopped); } - inline void setTimestamp(const QDateTime &time) { _timestamp = time; } + inline void setTimestamp(const QDateTime& time) { _timestamp = time; } inline QDateTime timestamp() const { return _timestamp; } - //inline void setData(const QVariant &data) { _data = data; } - //inline QVariant data() const { return _data; } + // inline void setData(const QVariant &data) { _data = data; } + // inline QVariant data() const { return _data; } // call EventManager::createEvent(map) instead! - static Event *fromVariantMap(QVariantMap &map, Network *network); + static Event* fromVariantMap(QVariantMap& map, Network* network); QVariantMap toVariantMap() const; protected: virtual inline QString className() const { return "Event"; } - virtual inline void debugInfo(QDebug &dbg) const { Q_UNUSED(dbg); } + virtual inline void debugInfo(QDebug& dbg) const { Q_UNUSED(dbg); } - explicit Event(EventManager::EventType type, QVariantMap &map); + explicit Event(EventManager::EventType type, QVariantMap& map); // must only use primitive types: string, int, double, list, hash // we want to convert this to JSON in the future! - virtual void toVariantMap(QVariantMap &map) const; + virtual void toVariantMap(QVariantMap& map) const; inline void setValid(bool valid) { _valid = valid; } @@ -71,15 +72,9 @@ private: EventManager::EventType _type; EventManager::EventFlags _flags; QDateTime _timestamp; - //QVariant _data; - bool _valid; + bool _valid{true}; - friend QDebug operator<<(QDebug dbg, Event *e); + friend COMMON_EXPORT QDebug operator<<(QDebug dbg, Event* e); }; - -QDebug operator<<(QDebug dbg, Event *e); - -/*******/ - -#endif +COMMON_EXPORT QDebug operator<<(QDebug dbg, Event* e);