X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetworkevent.h;h=39d48686ac41d49d6b9a59b2012352893d2f3377;hp=3bad605a4ec9e0a531cb6403e57cef24f584185b;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/common/networkevent.h b/src/common/networkevent.h
index 3bad605a..39d48686 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,16 +18,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef NETWORKEVENT_H
-#define NETWORKEVENT_H
+#pragma once
 
 #include <QStringList>
 #include <QVariantList>
+#include <utility>
 
 #include "event.h"
 #include "network.h"
 
-class NetworkEvent : public Event
+class COMMON_EXPORT NetworkEvent : public Event
 {
 public:
     explicit NetworkEvent(EventManager::EventType type, Network *network)
@@ -42,10 +42,10 @@ public:
 
 protected:
     explicit NetworkEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    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;
@@ -54,7 +54,7 @@ private:
 
 /*****************************************************************************/
 
-class NetworkConnectionEvent : public NetworkEvent
+class COMMON_EXPORT NetworkConnectionEvent : public NetworkEvent
 {
 public:
     explicit NetworkConnectionEvent(EventManager::EventType type, Network *network, Network::ConnectionState state)
@@ -67,10 +67,10 @@ public:
 
 protected:
     explicit NetworkConnectionEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    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));
@@ -84,12 +84,12 @@ private:
 };
 
 
-class NetworkDataEvent : public NetworkEvent
+class COMMON_EXPORT NetworkDataEvent : public NetworkEvent
 {
 public:
-    explicit NetworkDataEvent(EventManager::EventType type, Network *network, const QByteArray &data)
+    explicit NetworkDataEvent(EventManager::EventType type, Network *network, QByteArray data)
         : NetworkEvent(type, network),
-        _data(data)
+        _data(std::move(data))
     {}
 
     inline QByteArray data() const { return _data; }
@@ -97,10 +97,10 @@ public:
 
 protected:
     explicit NetworkDataEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    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();
@@ -114,18 +114,18 @@ private:
 };
 
 
-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)
+        QString channel,
+        QStringList users,
+        QString quitMsg)
         : NetworkEvent(type, network),
-        _channel(channel),
-        _users(users),
-        _quitMsg(quitMsg)
+        _channel(std::move(channel)),
+        _users(std::move(users)),
+        _quitMsg(std::move(quitMsg))
     {}
 
     inline QString channel() const { return _channel; }
@@ -134,10 +134,10 @@ public:
 
 protected:
     explicit NetworkSplitEvent(EventManager::EventType type, QVariantMap &map, Network *network);
-    void toVariantMap(QVariantMap &map) const;
+    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())
@@ -153,6 +153,3 @@ private:
 
     friend class NetworkEvent;
 };
-
-
-#endif