X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkevent.h;h=b3b8026285e92c838fe69e1d64b4291762380f7d;hp=3bad605a4ec9e0a531cb6403e57cef24f584185b;hb=HEAD;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/common/networkevent.h b/src/common/networkevent.h
index 3bad605a..b3b80262 100644
--- a/src/common/networkevent.h
+++ b/src/common/networkevent.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 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 NETWORKEVENT_H
-#define NETWORKEVENT_H
+#pragma once
+
+#include <utility>
 
 #include <QStringList>
 #include <QVariantList>
@@ -27,105 +28,96 @@
 #include "event.h"
 #include "network.h"
 
-class NetworkEvent : public Event
+class COMMON_EXPORT NetworkEvent : public Event
 {
 public:
-    explicit NetworkEvent(EventManager::EventType type, Network *network)
-        : Event(type),
-        _network(network)
+    explicit NetworkEvent(EventManager::EventType type, Network* network)
+        : Event(type)
+        , _network(network)
     {}
 
     inline NetworkId networkId() const { return network() ? network()->networkId() : NetworkId(); }
-    inline Network *network() const { return _network; }
+    inline Network* network() const { return _network; }
 
-    static Event *create(EventManager::EventType type, QVariantMap &map, Network *network);
+    static Event* create(EventManager::EventType type, QVariantMap& map, Network* network);
 
 protected:
-    explicit NetworkEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    explicit NetworkEvent(EventManager::EventType type, QVariantMap& map, Network* network);
+    void toVariantMap(QVariantMap& map) const override;
 
-    virtual inline QString className() const { return "NetworkEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const { dbg.nospace() << ", net = " << qPrintable(_network->networkName()); }
+    inline QString className() const override { return "NetworkEvent"; }
+    inline void debugInfo(QDebug& dbg) const override { dbg.nospace() << ", net = " << qPrintable(_network->networkName()); }
 
 private:
-    Network *_network;
+    Network* _network;
 };
 
-
 /*****************************************************************************/
 
-class NetworkConnectionEvent : public NetworkEvent
+class COMMON_EXPORT NetworkConnectionEvent : public NetworkEvent
 {
 public:
-    explicit NetworkConnectionEvent(EventManager::EventType type, Network *network, Network::ConnectionState state)
-        : NetworkEvent(type, network),
-        _state(state)
+    explicit NetworkConnectionEvent(EventManager::EventType type, Network* network, Network::ConnectionState state)
+        : NetworkEvent(type, network)
+        , _state(state)
     {}
 
     inline Network::ConnectionState connectionState() const { return _state; }
     inline void setConnectionState(Network::ConnectionState state) { _state = state; }
 
 protected:
-    explicit NetworkConnectionEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    explicit NetworkConnectionEvent(EventManager::EventType type, QVariantMap& map, Network* network);
+    void toVariantMap(QVariantMap& map) const override;
 
-    virtual inline QString className() const { return "NetworkConnectionEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "NetworkConnectionEvent"; }
+    inline void debugInfo(QDebug& dbg) const override
     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", state = " << qPrintable(QString::number(_state));
     }
 
-
 private:
     Network::ConnectionState _state;
 
     friend class NetworkEvent;
 };
 
-
-class NetworkDataEvent : public NetworkEvent
+class COMMON_EXPORT NetworkDataEvent : public NetworkEvent
 {
 public:
-    explicit NetworkDataEvent(EventManager::EventType type, Network *network, const QByteArray &data)
-        : NetworkEvent(type, network),
-        _data(data)
+    explicit NetworkDataEvent(EventManager::EventType type, Network* network, QByteArray data)
+        : NetworkEvent(type, network)
+        , _data(std::move(data))
     {}
 
     inline QByteArray data() const { return _data; }
-    inline void setData(const QByteArray &data) { _data = data; }
+    inline void setData(const QByteArray& data) { _data = data; }
 
 protected:
-    explicit NetworkDataEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    explicit NetworkDataEvent(EventManager::EventType type, QVariantMap& map, Network* network);
+    void toVariantMap(QVariantMap& map) const override;
 
-    virtual inline QString className() const { return "NetworkDataEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "NetworkDataEvent"; }
+    inline void debugInfo(QDebug& dbg) const override
     {
         NetworkEvent::debugInfo(dbg);
         dbg.nospace() << ", data = " << data();
     }
 
-
 private:
     QByteArray _data;
 
     friend class NetworkEvent;
 };
 
-
-class NetworkSplitEvent : public NetworkEvent
+class COMMON_EXPORT NetworkSplitEvent : public NetworkEvent
 {
 public:
-    explicit NetworkSplitEvent(EventManager::EventType type,
-        Network *network,
-        const QString &channel,
-        const QStringList &users,
-        const QString &quitMsg)
-        : NetworkEvent(type, network),
-        _channel(channel),
-        _users(users),
-        _quitMsg(quitMsg)
+    explicit NetworkSplitEvent(EventManager::EventType type, Network* network, QString channel, QStringList users, QString quitMsg)
+        : NetworkEvent(type, network)
+        , _channel(std::move(channel))
+        , _users(std::move(users))
+        , _quitMsg(std::move(quitMsg))
     {}
 
     inline QString channel() const { return _channel; }
@@ -133,19 +125,16 @@ public:
     inline QString quitMessage() const { return _quitMsg; }
 
 protected:
-    explicit NetworkSplitEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    explicit NetworkSplitEvent(EventManager::EventType type, QVariantMap& map, Network* network);
+    void toVariantMap(QVariantMap& map) const override;
 
-    virtual inline QString className() const { return "NetworkSplitEvent"; }
-    virtual inline void debugInfo(QDebug &dbg) const
+    inline QString className() const override { return "NetworkSplitEvent"; }
+    inline void debugInfo(QDebug& dbg) const override
     {
         NetworkEvent::debugInfo(dbg);
-        dbg.nospace() << ", channel = " << qPrintable(channel())
-                      << ", users = " << users()
-                      << ", quitmsg = " << quitMessage();
+        dbg.nospace() << ", channel = " << qPrintable(channel()) << ", users = " << users() << ", quitmsg = " << quitMessage();
     }
 
-
 private:
     QString _channel;
     QStringList _users;
@@ -153,6 +142,3 @@ private:
 
     friend class NetworkEvent;
 };
-
-
-#endif