projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Pass arguments by value and move in constructors
[quassel.git]
/
src
/
common
/
networkevent.h
diff --git
a/src/common/networkevent.h
b/src/common/networkevent.h
index
fcae0b4
..
39d4868
100644
(file)
--- a/
src/common/networkevent.h
+++ b/
src/common/networkevent.h
@@
-22,6
+22,7
@@
#include <QStringList>
#include <QVariantList>
#include <QStringList>
#include <QVariantList>
+#include <utility>
#include "event.h"
#include "network.h"
#include "event.h"
#include "network.h"
@@
-41,10
+42,10
@@
public:
protected:
explicit NetworkEvent(EventManager::EventType type, QVariantMap &map, Network *network);
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;
private:
Network *_network;
@@
-66,10
+67,10
@@
public:
protected:
explicit NetworkConnectionEvent(EventManager::EventType type, QVariantMap &map, Network *network);
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));
{
NetworkEvent::debugInfo(dbg);
dbg.nospace() << ", state = " << qPrintable(QString::number(_state));
@@
-86,9
+87,9
@@
private:
class COMMON_EXPORT NetworkDataEvent : public NetworkEvent
{
public:
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),
: NetworkEvent(type, network),
- _data(
data
)
+ _data(
std::move(data)
)
{}
inline QByteArray data() const { return _data; }
{}
inline QByteArray data() const { return _data; }
@@
-96,10
+97,10
@@
public:
protected:
explicit NetworkDataEvent(EventManager::EventType type, QVariantMap &map, Network *network);
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();
{
NetworkEvent::debugInfo(dbg);
dbg.nospace() << ", data = " << data();
@@
-118,13
+119,13
@@
class COMMON_EXPORT NetworkSplitEvent : public NetworkEvent
public:
explicit NetworkSplitEvent(EventManager::EventType type,
Network *network,
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),
: 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; }
{}
inline QString channel() const { return _channel; }
@@
-133,10
+134,10
@@
public:
protected:
explicit NetworkSplitEvent(EventManager::EventType type, QVariantMap &map, Network *network);
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())
{
NetworkEvent::debugInfo(dbg);
dbg.nospace() << ", channel = " << qPrintable(channel())