projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Remove old-style slot usage in NetworkModelController
[quassel.git]
/
src
/
common
/
ircevent.h
diff --git
a/src/common/ircevent.h
b/src/common/ircevent.h
index
e5a2313
..
5d13b2f
100644
(file)
--- a/
src/common/ircevent.h
+++ b/
src/common/ircevent.h
@@
-20,6
+20,8
@@
#pragma once
#pragma once
+#include <utility>
+
#include "common-export.h"
#include "networkevent.h"
#include "common-export.h"
#include "networkevent.h"
@@
-28,10
+30,10
@@
class COMMON_EXPORT IrcEvent : public NetworkEvent
{
public:
class COMMON_EXPORT IrcEvent : public NetworkEvent
{
public:
- explicit IrcEvent(EventManager::EventType type, Network *network,
const QString &prefix, const QStringList &
params = QStringList())
+ explicit IrcEvent(EventManager::EventType type, Network *network,
QString prefix, QStringList
params = QStringList())
: NetworkEvent(type, network),
: NetworkEvent(type, network),
- _prefix(
prefix
),
- _params(
params
)
+ _prefix(
std::move(prefix)
),
+ _params(
std::move(params)
)
{}
inline QString prefix() const { return _prefix; }
{}
inline QString prefix() const { return _prefix; }
@@
-46,10
+48,10
@@
public:
protected:
explicit IrcEvent(EventManager::EventType type, QVariantMap &map, Network *network);
protected:
explicit IrcEvent(EventManager::EventType type, QVariantMap &map, Network *network);
- void toVariantMap(QVariantMap &map) const;
+ void toVariantMap(QVariantMap &map) const
override
;
-
virtual inline QString className() const
{ return "IrcEvent"; }
- virtual inline void debugInfo(QDebug &dbg) const
+
inline QString className() const override
{ return "IrcEvent"; }
+ inline void debugInfo(QDebug &dbg) const override
{
NetworkEvent::debugInfo(dbg);
dbg << ", prefix = " << qPrintable(prefix())
{
NetworkEvent::debugInfo(dbg);
dbg << ", prefix = " << qPrintable(prefix())
@@
-66,10
+68,10
@@
private:
class COMMON_EXPORT IrcEventNumeric : public IrcEvent
{
public:
class COMMON_EXPORT IrcEventNumeric : public IrcEvent
{
public:
- explicit IrcEventNumeric(uint number, Network *network, const QString &prefix,
const QString &
target, const QStringList ¶ms = QStringList())
+ explicit IrcEventNumeric(uint number, Network *network, const QString &prefix,
QString
target, const QStringList ¶ms = QStringList())
: IrcEvent(EventManager::IrcEventNumeric, network, prefix, params),
_number(number),
: IrcEvent(EventManager::IrcEventNumeric, network, prefix, params),
_number(number),
- _target(
target
)
+ _target(
std::move(target)
)
{}
inline uint number() const { return _number; }
{}
inline uint number() const { return _number; }
@@
-79,10
+81,10
@@
public:
protected:
explicit IrcEventNumeric(EventManager::EventType type, QVariantMap &map, Network *network);
protected:
explicit IrcEventNumeric(EventManager::EventType type, QVariantMap &map, Network *network);
- void toVariantMap(QVariantMap &map) const;
+ void toVariantMap(QVariantMap &map) const
override
;
-
virtual inline QString className() const
{ return "IrcEventNumeric"; }
- virtual inline void debugInfo(QDebug &dbg) const
+
inline QString className() const override
{ return "IrcEventNumeric"; }
+ inline void debugInfo(QDebug &dbg) const override
{
dbg << ", num = " << number();
NetworkEvent::debugInfo(dbg);
{
dbg << ", num = " << number();
NetworkEvent::debugInfo(dbg);
@@
-104,10
+106,10
@@
class COMMON_EXPORT IrcEventRawMessage : public IrcEvent
{
public:
explicit inline IrcEventRawMessage(EventManager::EventType type, Network *network,
{
public:
explicit inline IrcEventRawMessage(EventManager::EventType type, Network *network,
-
const QByteArray &
rawMessage, const QString &prefix, const QString &target,
+
QByteArray
rawMessage, const QString &prefix, const QString &target,
const QDateTime ×tamp = QDateTime())
: IrcEvent(type, network, prefix, QStringList() << target),
const QDateTime ×tamp = QDateTime())
: IrcEvent(type, network, prefix, QStringList() << target),
- _rawMessage(
rawMessage
)
+ _rawMessage(
std::move(rawMessage)
)
{
setTimestamp(timestamp);
}
{
setTimestamp(timestamp);
}
@@
-121,10
+123,10
@@
public:
protected:
explicit IrcEventRawMessage(EventManager::EventType type, QVariantMap &map, Network *network);
protected:
explicit IrcEventRawMessage(EventManager::EventType type, QVariantMap &map, Network *network);
- void toVariantMap(QVariantMap &map) const;
+ void toVariantMap(QVariantMap &map) const
override
;
-
virtual inline QString className() const
{ return "IrcEventRawMessage"; }
- virtual inline void debugInfo(QDebug &dbg) const
+
inline QString className() const override
{ return "IrcEventRawMessage"; }
+ inline void debugInfo(QDebug &dbg) const override
{
NetworkEvent::debugInfo(dbg);
dbg << ", target = " << qPrintable(target())
{
NetworkEvent::debugInfo(dbg);
dbg << ", target = " << qPrintable(target())