From 3a3e844f9fcfd12235a0086af75ecd503b621ef4 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 6 Sep 2018 21:01:22 +0200 Subject: [PATCH] modernize: Pass arguments by value and move in constructors If a method (or constructor) wants to store an argument in a local variable or attribute, one should prefer passing it in by value and moving it into the final location, rather than taking a const reference and copying it over. In the best case, this saves one copy, if the method is called with an rvalue. This pattern is most frequent in constructors initializing class members, so let clang-tidy fix this for argument types that have move constructors. --- src/client/clientsettings.cpp | 5 +- src/client/clientsettings.h | 2 +- src/client/networkmodel.cpp | 5 +- src/client/networkmodel.h | 2 +- src/client/treemodel.cpp | 5 +- src/client/treemodel.h | 2 +- src/common/aliasmanager.h | 3 +- src/common/basichandler.cpp | 5 +- src/common/basichandler.h | 2 +- src/common/bufferinfo.cpp | 3 +- src/common/buffersyncer.cpp | 18 ++--- src/common/buffersyncer.h | 2 +- src/common/ctcpevent.h | 11 +-- src/common/highlightrulemanager.h | 4 +- src/common/ignorelistmanager.h | 9 +-- src/common/ircevent.h | 16 +++-- src/common/irclisthelper.h | 4 +- src/common/message.cpp | 37 +++++----- src/common/message.h | 12 ++-- src/common/messageevent.cpp | 8 ++- src/common/messageevent.h | 4 +- src/common/network.h | 5 +- src/common/networkevent.h | 17 ++--- src/common/protocol.h | 71 ++++++++++--------- src/common/settings.h | 3 +- src/common/signalproxy.cpp | 4 +- src/common/transfer.cpp | 8 ++- src/common/transfer.h | 2 +- src/core/coresession.h | 5 +- src/core/coreuserinputhandler.h | 4 +- src/core/ctcpparser.h | 3 +- src/core/keyevent.h | 10 +-- src/qtui/chatitem.h | 3 +- src/qtui/chatscene.cpp | 6 +- src/qtui/chatscene.h | 2 +- src/qtui/qtuimessageprocessor.h | 5 +- .../settingspages/bufferviewsettingspage.cpp | 3 +- .../settingspages/bufferviewsettingspage.h | 2 +- .../settingspages/identitiessettingspage.cpp | 5 +- src/qtui/settingspages/identityeditwidget.h | 2 +- .../settingspages/networkssettingspage.cpp | 5 +- src/qtui/settingspages/networkssettingspage.h | 4 +- src/uisupport/aboutdata.cpp | 11 +-- src/uisupport/aboutdata.h | 2 +- src/uisupport/abstractnotificationbackend.h | 5 +- src/uisupport/settingspage.cpp | 7 +- src/uisupport/settingspage.h | 2 +- src/uisupport/uisettings.cpp | 6 +- src/uisupport/uisettings.h | 2 +- 49 files changed, 203 insertions(+), 160 deletions(-) diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp index 5e114312..171d7fe4 100644 --- a/src/client/clientsettings.cpp +++ b/src/client/clientsettings.cpp @@ -25,6 +25,7 @@ #include #ifdef HAVE_SSL #include +#include #endif #include "client.h" @@ -42,9 +43,9 @@ ClientSettings::~ClientSettings() /***********************************************************************************************/ -CoreAccountSettings::CoreAccountSettings(const QString &subgroup) +CoreAccountSettings::CoreAccountSettings(QString subgroup) : ClientSettings("CoreAccounts"), - _subgroup(subgroup) + _subgroup(std::move(subgroup)) { } diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h index ce2a71ef..a8980efa 100644 --- a/src/client/clientsettings.h +++ b/src/client/clientsettings.h @@ -54,7 +54,7 @@ class CLIENT_EXPORT CoreAccountSettings : public ClientSettings { public: // stores account-specific data in CoreAccounts/$ACCID/$SUBGROUP/$KEY) - CoreAccountSettings(const QString &subgroup = "General"); + CoreAccountSettings(QString subgroup = "General"); void notify(const QString &key, QObject *receiver, const char *slot) override; diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index 16349364..7b7f5bc4 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -22,6 +22,7 @@ #include #include +#include #include "buffermodel.h" #include "buffersettings.h" @@ -282,9 +283,9 @@ void NetworkItem::onNetworkDestroyed() /***************************************** * Fancy Buffer Items *****************************************/ -BufferItem::BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent) +BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent) : PropertyMapItem(parent), - _bufferInfo(bufferInfo), + _bufferInfo(std::move(bufferInfo)), _activity(BufferInfo::NoActivity) { setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled); diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h index 4f1e26e7..370e6de3 100644 --- a/src/client/networkmodel.h +++ b/src/client/networkmodel.h @@ -109,7 +109,7 @@ class BufferItem : public PropertyMapItem Q_PROPERTY(int nickCount READ nickCount) public : - BufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent = nullptr); + BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent = nullptr); QStringList propertyOrder() const override; diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index fa66ba60..e456f6fd 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -22,6 +22,7 @@ #include #include +#include #include "quassel.h" @@ -230,9 +231,9 @@ void AbstractTreeItem::dumpChildList() /***************************************** * SimpleTreeItem *****************************************/ -SimpleTreeItem::SimpleTreeItem(const QList &data, AbstractTreeItem *parent) +SimpleTreeItem::SimpleTreeItem(QList data, AbstractTreeItem *parent) : AbstractTreeItem(parent), - _itemData(data) + _itemData(std::move(data)) { } diff --git a/src/client/treemodel.h b/src/client/treemodel.h index 5d3fbf3f..db7e5abb 100644 --- a/src/client/treemodel.h +++ b/src/client/treemodel.h @@ -106,7 +106,7 @@ class CLIENT_EXPORT SimpleTreeItem : public AbstractTreeItem Q_OBJECT public: - SimpleTreeItem(const QList &data, AbstractTreeItem *parent = nullptr); + SimpleTreeItem(QList data, AbstractTreeItem *parent = nullptr); ~SimpleTreeItem() override; QVariant data(int column, int role) const override; diff --git a/src/common/aliasmanager.h b/src/common/aliasmanager.h index fd3f5d66..b061465c 100644 --- a/src/common/aliasmanager.h +++ b/src/common/aliasmanager.h @@ -23,6 +23,7 @@ #include "common-export.h" #include +#include #include "bufferinfo.h" #include "syncableobject.h" @@ -41,7 +42,7 @@ public: struct Alias { QString name; QString expansion; - Alias(const QString &name_, const QString &expansion_) : name(name_), expansion(expansion_) {} + Alias(QString name_, QString expansion_) : name(std::move(name_)), expansion(std::move(expansion_)) {} }; using AliasList = QList; diff --git a/src/common/basichandler.cpp b/src/common/basichandler.cpp index 6e7e4387..5c3140fd 100644 --- a/src/common/basichandler.cpp +++ b/src/common/basichandler.cpp @@ -22,6 +22,7 @@ #include #include +#include BasicHandler::BasicHandler(QObject *parent) : QObject(parent), @@ -32,11 +33,11 @@ BasicHandler::BasicHandler(QObject *parent) } -BasicHandler::BasicHandler(const QString &methodPrefix, QObject *parent) +BasicHandler::BasicHandler(QString methodPrefix, QObject *parent) : QObject(parent), _defaultHandler(-1), _initDone(false), - _methodPrefix(methodPrefix) + _methodPrefix(std::move(methodPrefix)) { } diff --git a/src/common/basichandler.h b/src/common/basichandler.h index 081e8df6..8b633742 100644 --- a/src/common/basichandler.h +++ b/src/common/basichandler.h @@ -34,7 +34,7 @@ class COMMON_EXPORT BasicHandler : public QObject public: BasicHandler(QObject *parent = nullptr); - BasicHandler(const QString &methodPrefix, QObject *parent = nullptr); + BasicHandler(QString methodPrefix, QObject *parent = nullptr); QStringList providesHandlers(); diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp index 1d0496d2..8ac1f4b0 100644 --- a/src/common/bufferinfo.cpp +++ b/src/common/bufferinfo.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "bufferinfo.h" @@ -42,7 +43,7 @@ BufferInfo::BufferInfo(BufferId id, NetworkId networkid, Type type, uint gid, Q _netid(networkid), _type(type), _groupId(gid), - _bufferName(buf) + _bufferName(std::move(buf)) { } diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp index 5c3a7d36..99493068 100644 --- a/src/common/buffersyncer.cpp +++ b/src/common/buffersyncer.cpp @@ -20,6 +20,8 @@ #include "buffersyncer.h" +#include + BufferSyncer::BufferSyncer(QObject *parent) : SyncableObject(parent) { @@ -27,16 +29,16 @@ BufferSyncer::BufferSyncer(QObject *parent) BufferSyncer::BufferSyncer( - const QHash &lastSeenMsg, - const QHash &markerLines, - const QHash &activities, - const QHash &highlightCounts, + QHash lastSeenMsg, + QHash markerLines, + QHash activities, + QHash highlightCounts, QObject *parent ) : SyncableObject(parent), - _lastSeenMsg(lastSeenMsg), - _markerLines(markerLines), - _bufferActivities(activities), - _highlightCounts(highlightCounts) + _lastSeenMsg(std::move(lastSeenMsg)), + _markerLines(std::move(markerLines)), + _bufferActivities(std::move(activities)), + _highlightCounts(std::move(highlightCounts)) { } diff --git a/src/common/buffersyncer.h b/src/common/buffersyncer.h index 6db6f9c8..6d9160cd 100644 --- a/src/common/buffersyncer.h +++ b/src/common/buffersyncer.h @@ -33,7 +33,7 @@ class COMMON_EXPORT BufferSyncer : public SyncableObject public: explicit BufferSyncer(QObject *parent); - explicit BufferSyncer(const QHash &lastSeenMsg, const QHash &markerLines, const QHash &activities, const QHash &highlightCounts, QObject *parent); + explicit BufferSyncer(QHash lastSeenMsg, QHash markerLines, QHash activities, QHash highlightCounts, QObject *parent); MsgId lastSeenMsg(BufferId buffer) const; MsgId markerLine(BufferId buffer) const; diff --git a/src/common/ctcpevent.h b/src/common/ctcpevent.h index 0a31077b..f9d7f437 100644 --- a/src/common/ctcpevent.h +++ b/src/common/ctcpevent.h @@ -25,6 +25,7 @@ #include "ircevent.h" #include +#include class COMMON_EXPORT CtcpEvent : public IrcEvent { @@ -34,14 +35,14 @@ public: Reply }; - explicit CtcpEvent(EventManager::EventType type, Network *network, const QString &prefix, const QString &target, - CtcpType ctcpType, const QString &ctcpCmd, const QString ¶m, + explicit CtcpEvent(EventManager::EventType type, Network *network, const QString &prefix, QString target, + CtcpType ctcpType, QString ctcpCmd, QString param, const QDateTime ×tamp = QDateTime(), const QUuid &uuid = QUuid()) : IrcEvent(type, network, prefix), _ctcpType(ctcpType), - _ctcpCmd(ctcpCmd), - _target(target), - _param(param), + _ctcpCmd(std::move(ctcpCmd)), + _target(std::move(target)), + _param(std::move(param)), _uuid(uuid) { setTimestamp(timestamp); diff --git a/src/common/highlightrulemanager.h b/src/common/highlightrulemanager.h index addbbf66..5a2d4a87 100644 --- a/src/common/highlightrulemanager.h +++ b/src/common/highlightrulemanager.h @@ -77,8 +77,8 @@ public: */ HighlightRule(int id, QString contents, bool isRegEx, bool isCaseSensitive, bool isEnabled, bool isInverse, QString sender, QString chanName) - : _id(id), _contents(contents), _isRegEx(isRegEx), _isCaseSensitive(isCaseSensitive), - _isEnabled(isEnabled), _isInverse(isInverse), _sender(sender), _chanName(chanName) + : _id(id), _contents(std::move(contents)), _isRegEx(isRegEx), _isCaseSensitive(isCaseSensitive), + _isEnabled(isEnabled), _isInverse(isInverse), _sender(std::move(sender)), _chanName(std::move(chanName)) { _cacheInvalid = true; // Cache expression matches on construction diff --git a/src/common/ignorelistmanager.h b/src/common/ignorelistmanager.h index 1bec1c84..bd096087 100644 --- a/src/common/ignorelistmanager.h +++ b/src/common/ignorelistmanager.h @@ -25,6 +25,7 @@ #include #include #include +#include #include "expressionmatch.h" #include "message.h" @@ -81,11 +82,11 @@ public: * @param scopeRule String representing a scope rule expression to match * @param isEnabled True if enabled, otherwise false */ - IgnoreListItem(IgnoreType type, const QString &contents, bool isRegEx, - StrictnessType strictness, ScopeType scope, const QString &scopeRule, + IgnoreListItem(IgnoreType type, QString contents, bool isRegEx, + StrictnessType strictness, ScopeType scope, QString scopeRule, bool isEnabled) - : _contents(contents), _isRegEx(isRegEx), _strictness(strictness), - _scope(scope), _scopeRule(scopeRule), _isEnabled(isEnabled) + : _contents(std::move(contents)), _isRegEx(isRegEx), _strictness(strictness), + _scope(scope), _scopeRule(std::move(scopeRule)), _isEnabled(isEnabled) { // Allow passing empty "contents" as they can happen when editing an ignore rule diff --git a/src/common/ircevent.h b/src/common/ircevent.h index c3611e4f..5d13b2f5 100644 --- a/src/common/ircevent.h +++ b/src/common/ircevent.h @@ -20,6 +20,8 @@ #pragma once +#include + #include "common-export.h" #include "networkevent.h" @@ -28,10 +30,10 @@ class COMMON_EXPORT IrcEvent : public NetworkEvent { public: - explicit IrcEvent(EventManager::EventType type, Network *network, const QString &prefix, const QStringList ¶ms = QStringList()) + explicit IrcEvent(EventManager::EventType type, Network *network, QString prefix, QStringList params = QStringList()) : NetworkEvent(type, network), - _prefix(prefix), - _params(params) + _prefix(std::move(prefix)), + _params(std::move(params)) {} inline QString prefix() const { return _prefix; } @@ -66,10 +68,10 @@ private: 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), - _target(target) + _target(std::move(target)) {} inline uint number() const { return _number; } @@ -104,10 +106,10 @@ class COMMON_EXPORT IrcEventRawMessage : public IrcEvent { 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), - _rawMessage(rawMessage) + _rawMessage(std::move(rawMessage)) { setTimestamp(timestamp); } diff --git a/src/common/irclisthelper.h b/src/common/irclisthelper.h index b5d72dff..aee7cf12 100644 --- a/src/common/irclisthelper.h +++ b/src/common/irclisthelper.h @@ -20,6 +20,8 @@ #pragma once +#include + #include "common-export.h" #include "syncableobject.h" @@ -45,7 +47,7 @@ public: QString channelName; quint32 userCount; QString topic; - ChannelDescription(const QString &channelName_, quint32 userCount_, const QString &topic_) : channelName(channelName_), userCount(userCount_), topic(topic_) {}; + ChannelDescription(QString channelName_, quint32 userCount_, QString topic_) : channelName(std::move(channelName_)), userCount(userCount_), topic(std::move(topic_)) {}; }; public slots: diff --git a/src/common/message.cpp b/src/common/message.cpp index fc50d376..8cf74d2c 100644 --- a/src/common/message.cpp +++ b/src/common/message.cpp @@ -25,32 +25,33 @@ #include "signalproxy.h" #include +#include -Message::Message(const BufferInfo &bufferInfo, Type type, const QString &contents, const QString &sender, - const QString &senderPrefixes, const QString &realName, const QString &avatarUrl, Flags flags) +Message::Message(BufferInfo bufferInfo, Type type, QString contents, QString sender, + QString senderPrefixes, QString realName, QString avatarUrl, Flags flags) : _timestamp(QDateTime::currentDateTime().toUTC()), - _bufferInfo(bufferInfo), - _contents(contents), - _sender(sender), - _senderPrefixes(senderPrefixes), - _realName(realName), - _avatarUrl(avatarUrl), + _bufferInfo(std::move(bufferInfo)), + _contents(std::move(contents)), + _sender(std::move(sender)), + _senderPrefixes(std::move(senderPrefixes)), + _realName(std::move(realName)), + _avatarUrl(std::move(avatarUrl)), _type(type), _flags(flags) { } -Message::Message(const QDateTime &ts, const BufferInfo &bufferInfo, Type type, const QString &contents, - const QString &sender, const QString &senderPrefixes, const QString &realName, - const QString &avatarUrl, Flags flags) - : _timestamp(ts), - _bufferInfo(bufferInfo), - _contents(contents), - _sender(sender), - _senderPrefixes(senderPrefixes), - _realName(realName), - _avatarUrl(avatarUrl), +Message::Message(QDateTime ts, BufferInfo bufferInfo, Type type, QString contents, + QString sender, QString senderPrefixes, QString realName, + QString avatarUrl, Flags flags) + : _timestamp(std::move(ts)), + _bufferInfo(std::move(bufferInfo)), + _contents(std::move(contents)), + _sender(std::move(sender)), + _senderPrefixes(std::move(senderPrefixes)), + _realName(std::move(realName)), + _avatarUrl(std::move(avatarUrl)), _type(type), _flags(flags) { diff --git a/src/common/message.h b/src/common/message.h index fa9e6b04..8b16aa0d 100644 --- a/src/common/message.h +++ b/src/common/message.h @@ -68,12 +68,12 @@ public: }; Q_DECLARE_FLAGS(Flags, Flag) - Message(const BufferInfo &bufferInfo = BufferInfo(), Type type = Plain, const QString &contents = {}, - const QString &sender = {}, const QString &senderPrefixes = {}, const QString &realName = {}, - const QString &avatarUrl = {}, Flags flags = None); - Message(const QDateTime &ts, const BufferInfo &buffer = BufferInfo(), Type type = Plain, - const QString &contents = {}, const QString &sender = {}, const QString &senderPrefixes = {}, - const QString &realName = {}, const QString &avatarUrl = {}, Flags flags = None); + Message(BufferInfo bufferInfo = BufferInfo(), Type type = Plain, QString contents = {}, + QString sender = {}, QString senderPrefixes = {}, QString realName = {}, + QString avatarUrl = {}, Flags flags = None); + Message(QDateTime ts, BufferInfo buffer = BufferInfo(), Type type = Plain, + QString contents = {}, QString sender = {}, QString senderPrefixes = {}, + QString realName = {}, QString avatarUrl = {}, Flags flags = None); inline static Message ChangeOfDay(const QDateTime &day) { return Message(day, BufferInfo(), DayChange); } inline const MsgId &msgId() const { return _msgId; } diff --git a/src/common/messageevent.cpp b/src/common/messageevent.cpp index 01b4049a..f58fa0b4 100644 --- a/src/common/messageevent.cpp +++ b/src/common/messageevent.cpp @@ -20,6 +20,8 @@ #include "messageevent.h" +#include + Event *MessageEvent::create(EventManager::EventType type, QVariantMap &map, Network *network) { if (type == EventManager::MessageEvent) @@ -29,13 +31,13 @@ Event *MessageEvent::create(EventManager::EventType type, QVariantMap &map, Netw } -MessageEvent::MessageEvent(Message::Type msgType, Network *net, const QString &msg, const QString &sender, const QString &target, +MessageEvent::MessageEvent(Message::Type msgType, Network *net, QString msg, const QString &sender, QString target, Message::Flags flags, const QDateTime ×tamp) : NetworkEvent(EventManager::MessageEvent, net), _msgType(msgType), - _text(msg), + _text(std::move(msg)), _sender(sender), - _target(target), + _target(std::move(target)), _msgFlags(flags) { IrcChannel *channel = network()->ircChannel(_target); diff --git a/src/common/messageevent.h b/src/common/messageevent.h index 9702e463..7e6df266 100644 --- a/src/common/messageevent.h +++ b/src/common/messageevent.h @@ -33,9 +33,9 @@ class COMMON_EXPORT MessageEvent : public NetworkEvent public: explicit MessageEvent(Message::Type msgType, Network *network, - const QString &msg, + QString msg, const QString &sender = QString(), - const QString &target = QString(), + QString target = QString(), Message::Flags msgFlags = Message::None, const QDateTime ×tamp = QDateTime() ); diff --git a/src/common/network.h b/src/common/network.h index 4fe30f1c..9e50e4ab 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -31,6 +31,7 @@ #include #include #include +#include #include "types.h" #include "util.h" @@ -134,9 +135,9 @@ public : Server() : port(6667), useSsl(false), sslVerify(true), sslVersion(0), useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {} - Server(const QString &host, uint port, const QString &password, bool useSsl, + Server(QString host, uint port, QString password, bool useSsl, bool sslVerify) - : host(host), port(port), password(password), useSsl(useSsl), sslVerify(sslVerify), + : host(std::move(host)), port(port), password(std::move(password)), useSsl(useSsl), sslVerify(sslVerify), sslVersion(0), useProxy(false), proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {} diff --git a/src/common/networkevent.h b/src/common/networkevent.h index 878b0646..39d48686 100644 --- a/src/common/networkevent.h +++ b/src/common/networkevent.h @@ -22,6 +22,7 @@ #include #include +#include #include "event.h" #include "network.h" @@ -86,9 +87,9 @@ private: 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; } @@ -118,13 +119,13 @@ 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; } diff --git a/src/common/protocol.h b/src/common/protocol.h index 1e3114f3..47dabd9b 100644 --- a/src/common/protocol.h +++ b/src/common/protocol.h @@ -23,6 +23,7 @@ #include #include #include +#include #include "quassel.h" @@ -58,10 +59,10 @@ struct HandshakeMessage { struct RegisterClient : public HandshakeMessage { - inline RegisterClient(Quassel::Features clientFeatures, const QString &clientVersion, const QString &buildDate, bool sslSupported = false) + inline RegisterClient(Quassel::Features clientFeatures, QString clientVersion, QString buildDate, bool sslSupported = false) : features(std::move(clientFeatures)) - , clientVersion(clientVersion) - , buildDate(buildDate) + , clientVersion(std::move(clientVersion)) + , buildDate(std::move(buildDate)) , sslSupported(sslSupported) {} @@ -76,8 +77,8 @@ struct RegisterClient : public HandshakeMessage struct ClientDenied : public HandshakeMessage { - inline ClientDenied(const QString &errorString) - : errorString(errorString) {} + inline ClientDenied(QString errorString) + : errorString(std::move(errorString)) {} QString errorString; }; @@ -85,11 +86,11 @@ struct ClientDenied : public HandshakeMessage struct ClientRegistered : public HandshakeMessage { - inline ClientRegistered(Quassel::Features coreFeatures, bool coreConfigured, const QVariantList &backendInfo, const QVariantList &authenticatorInfo, bool sslSupported) + inline ClientRegistered(Quassel::Features coreFeatures, bool coreConfigured, QVariantList backendInfo, QVariantList authenticatorInfo, bool sslSupported) : features(std::move(coreFeatures)) , coreConfigured(coreConfigured) - , backendInfo(backendInfo) - , authenticatorInfo(authenticatorInfo) + , backendInfo(std::move(backendInfo)) + , authenticatorInfo(std::move(authenticatorInfo)) , sslSupported(sslSupported) {} @@ -107,15 +108,15 @@ struct ClientRegistered : public HandshakeMessage struct SetupData : public HandshakeMessage { - inline SetupData(const QString &adminUser, const QString &adminPassword, const QString &backend, - const QVariantMap &setupData, const QString &authenticator = QString(), - const QVariantMap &authSetupData = QVariantMap()) - : adminUser(adminUser) - , adminPassword(adminPassword) - , backend(backend) - , setupData(setupData) - , authenticator(authenticator) - , authSetupData(authSetupData) + inline SetupData(QString adminUser, QString adminPassword, QString backend, + QVariantMap setupData, QString authenticator = QString(), + QVariantMap authSetupData = QVariantMap()) + : adminUser(std::move(adminUser)) + , adminPassword(std::move(adminPassword)) + , backend(std::move(backend)) + , setupData(std::move(setupData)) + , authenticator(std::move(authenticator)) + , authSetupData(std::move(authSetupData)) {} QString adminUser; @@ -129,8 +130,8 @@ struct SetupData : public HandshakeMessage struct SetupFailed : public HandshakeMessage { - inline SetupFailed(const QString &errorString) - : errorString(errorString) {} + inline SetupFailed(QString errorString) + : errorString(std::move(errorString)) {} QString errorString; }; @@ -144,8 +145,8 @@ struct SetupDone : public HandshakeMessage struct Login : public HandshakeMessage { - inline Login(const QString &user, const QString &password) - : user(user), password(password) {} + inline Login(QString user, QString password) + : user(std::move(user)), password(std::move(password)) {} QString user; QString password; @@ -154,8 +155,8 @@ struct Login : public HandshakeMessage struct LoginFailed : public HandshakeMessage { - inline LoginFailed(const QString &errorString) - : errorString(errorString) {} + inline LoginFailed(QString errorString) + : errorString(std::move(errorString)) {} QString errorString; }; @@ -171,8 +172,8 @@ struct LoginSuccess : public HandshakeMessage struct SessionState : public HandshakeMessage { inline SessionState() {} // needed for QMetaType (for the mono client) - inline SessionState(const QVariantList &identities, const QVariantList &bufferInfos, const QVariantList &networkIds) - : identities(identities), bufferInfos(bufferInfos), networkIds(networkIds) {} + inline SessionState(QVariantList identities, QVariantList bufferInfos, QVariantList networkIds) + : identities(std::move(identities)), bufferInfos(std::move(bufferInfos)), networkIds(std::move(networkIds)) {} QVariantList identities; QVariantList bufferInfos; @@ -190,8 +191,8 @@ struct SignalProxyMessage struct SyncMessage : public SignalProxyMessage { SyncMessage() = default; - SyncMessage(const QByteArray &className, const QString &objectName, const QByteArray &slotName, const QVariantList ¶ms) - : className(className), objectName(objectName), slotName(slotName), params(params) {} + SyncMessage(QByteArray className, QString objectName, QByteArray slotName, QVariantList params) + : className(std::move(className)), objectName(std::move(objectName)), slotName(std::move(slotName)), params(std::move(params)) {} QByteArray className; QString objectName; @@ -203,8 +204,8 @@ struct SyncMessage : public SignalProxyMessage struct RpcCall : public SignalProxyMessage { RpcCall() = default; - RpcCall(const QByteArray &slotName, const QVariantList ¶ms) - : slotName(slotName), params(params) {} + RpcCall(QByteArray slotName, QVariantList params) + : slotName(std::move(slotName)), params(std::move(params)) {} QByteArray slotName; QVariantList params; @@ -214,8 +215,8 @@ struct RpcCall : public SignalProxyMessage struct InitRequest : public SignalProxyMessage { InitRequest() = default; - InitRequest(const QByteArray &className, const QString &objectName) - : className(className), objectName(objectName) {} + InitRequest(QByteArray className, QString objectName) + : className(std::move(className)), objectName(std::move(objectName)) {} QByteArray className; QString objectName; @@ -225,8 +226,8 @@ struct InitRequest : public SignalProxyMessage struct InitData : public SignalProxyMessage { InitData() = default; - InitData(const QByteArray &className, const QString &objectName, const QVariantMap &initData) - : className(className), objectName(objectName), initData(initData) {} + InitData(QByteArray className, QString objectName, QVariantMap initData) + : className(std::move(className)), objectName(std::move(objectName)), initData(std::move(initData)) {} QByteArray className; QString objectName; @@ -238,7 +239,7 @@ struct InitData : public SignalProxyMessage struct HeartBeat { - inline HeartBeat(const QDateTime ×tamp) : timestamp(timestamp) {} + inline HeartBeat(QDateTime timestamp) : timestamp(std::move(timestamp)) {} QDateTime timestamp; }; @@ -246,7 +247,7 @@ struct HeartBeat struct HeartBeatReply { - inline HeartBeatReply(const QDateTime ×tamp) : timestamp(timestamp) {} + inline HeartBeatReply(QDateTime timestamp) : timestamp(std::move(timestamp)) {} QDateTime timestamp; }; diff --git a/src/common/settings.h b/src/common/settings.h index a575172c..5a2a6b7e 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -27,6 +27,7 @@ #include #include #include +#include #include "quassel.h" @@ -99,7 +100,7 @@ public: bool isWritable(); protected: - inline Settings(QString group_, QString appName_) : group(group_), appName(appName_) {} + inline Settings(QString group_, QString appName_) : group(std::move(group_)), appName(std::move(appName_)) {} inline virtual ~Settings() {} inline void setGroup(const QString &group_) { group = group_; } diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index f0711f16..7bd87513 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include + #include #include #include @@ -69,7 +71,7 @@ private: QObject *sender; int signalId; QByteArray signature; - Signal(QObject *sender, int sigId, const QByteArray &signature) : sender(sender), signalId(sigId), signature(signature) {} + Signal(QObject *sender, int sigId, QByteArray signature) : sender(sender), signalId(sigId), signature(std::move(signature)) {} Signal() : sender(nullptr), signalId(-1) {} }; diff --git a/src/common/transfer.cpp b/src/common/transfer.cpp index 12f85f7f..cf07f29d 100644 --- a/src/common/transfer.cpp +++ b/src/common/transfer.cpp @@ -20,6 +20,8 @@ #include "transfer.h" +#include + Transfer::Transfer(const QUuid &uuid, QObject *parent) : SyncableObject(parent), _status(Status::New), @@ -31,15 +33,15 @@ Transfer::Transfer(const QUuid &uuid, QObject *parent) init(); } -Transfer::Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent) +Transfer::Transfer(Direction direction, QString nick, QString fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent) : SyncableObject(parent), _status(Status::New), _direction(direction), - _fileName(fileName), + _fileName(std::move(fileName)), _address(address), _port(port), _fileSize(fileSize), - _nick(nick), + _nick(std::move(nick)), _uuid(QUuid::createUuid()) { init(); diff --git a/src/common/transfer.h b/src/common/transfer.h index 506d8834..66e01e28 100644 --- a/src/common/transfer.h +++ b/src/common/transfer.h @@ -62,7 +62,7 @@ public: Q_ENUMS(Direction) Transfer(const QUuid &uuid, QObject *parent = nullptr); // for creating a syncable object client-side - Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = nullptr); + Transfer(Direction direction, QString nick, QString fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = nullptr); QUuid uuid() const; Status status() const; diff --git a/src/core/coresession.h b/src/core/coresession.h index 2cbba0c5..ed9b5fea 100644 --- a/src/core/coresession.h +++ b/src/core/coresession.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "coreinfo.h" #include "corealiasmanager.h" @@ -290,6 +291,6 @@ struct RawMessage { QString text; QString sender; Message::Flags flags; - RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags) - : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {} + RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, Message::Flags flags) + : networkId(networkId), type(type), bufferType(bufferType), target(std::move(target)), text(std::move(text)), sender(std::move(sender)), flags(flags) {} }; diff --git a/src/core/coreuserinputhandler.h b/src/core/coreuserinputhandler.h index 6a9766ac..94d8464a 100644 --- a/src/core/coreuserinputhandler.h +++ b/src/core/coreuserinputhandler.h @@ -21,6 +21,8 @@ #ifndef COREUSERINPUTHANDLER_H #define COREUSERINPUTHANDLER_H +#include + #include "corebasichandler.h" #include "corenetwork.h" @@ -121,7 +123,7 @@ private: struct Command { BufferInfo bufferInfo; QString command; - Command(const BufferInfo &info, const QString &command) : bufferInfo(info), command(command) {} + Command(BufferInfo info, QString command) : bufferInfo(std::move(info)), command(std::move(command)) {} Command() {} }; diff --git a/src/core/ctcpparser.h b/src/core/ctcpparser.h index 5808a712..9630f6cd 100644 --- a/src/core/ctcpparser.h +++ b/src/core/ctcpparser.h @@ -22,6 +22,7 @@ #define CTCPPARSER_H #include +#include #include "corenetwork.h" #include "eventmanager.h" @@ -89,7 +90,7 @@ private: QList replies; CtcpReply() : network(nullptr) {} - CtcpReply(CoreNetwork *net, const QString &buf) : network(net), bufferName(buf) {} + CtcpReply(CoreNetwork *net, QString buf) : network(net), bufferName(std::move(buf)) {} }; QHash _replies; diff --git a/src/core/keyevent.h b/src/core/keyevent.h index b3f4d48c..65db084a 100644 --- a/src/core/keyevent.h +++ b/src/core/keyevent.h @@ -21,6 +21,8 @@ #ifndef KEYEVENT_H #define KEYEVENT_H +#include + #include "ircevent.h" class KeyEvent : public IrcEvent @@ -31,13 +33,13 @@ public: Finish }; - explicit KeyEvent(EventManager::EventType type, Network *network, const QString &prefix, const QString &target, - ExchangeType exchangeType, const QByteArray &key, + explicit KeyEvent(EventManager::EventType type, Network *network, const QString &prefix, QString target, + ExchangeType exchangeType, QByteArray key, const QDateTime ×tamp = QDateTime()) : IrcEvent(type, network, prefix), _exchangeType(exchangeType), - _target(target), - _key(key) + _target(std::move(target)), + _key(std::move(key)) { setTimestamp(timestamp); } diff --git a/src/qtui/chatitem.h b/src/qtui/chatitem.h index 41937fc6..a945795e 100644 --- a/src/qtui/chatitem.h +++ b/src/qtui/chatitem.h @@ -31,6 +31,7 @@ #include "qtui.h" #include +#include class ChatLine; class ChatView; @@ -249,7 +250,7 @@ struct ContentsChatItemPrivate { Clickable currentClickable; Clickable activeClickable; - ContentsChatItemPrivate(const ClickableList &c, ContentsChatItem *parent) : contentsItem(parent), clickables(c) {} + ContentsChatItemPrivate(ClickableList c, ContentsChatItem *parent) : contentsItem(parent), clickables(std::move(c)) {} }; class ContentsChatItem::WrapColumnFinder diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 4e6b766d..78c33c88 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -20,6 +20,8 @@ #include "chatscene.h" +#include + #include #include #include @@ -56,10 +58,10 @@ const qreal minContentsWidth = 200; -ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, ChatView *parent) +ChatScene::ChatScene(QAbstractItemModel *model, QString idString, qreal width, ChatView *parent) : QGraphicsScene(0, 0, width, 0, (QObject *)parent), _chatView(parent), - _idString(idString), + _idString(std::move(idString)), _model(model), _singleBufferId(BufferId()), _sceneRect(0, 0, width, 0), diff --git a/src/qtui/chatscene.h b/src/qtui/chatscene.h index b2d31fcd..ed27be77 100644 --- a/src/qtui/chatscene.h +++ b/src/qtui/chatscene.h @@ -72,7 +72,7 @@ public: TripleClick }; - ChatScene(QAbstractItemModel *model, const QString &idString, qreal width, ChatView *parent); + ChatScene(QAbstractItemModel *model, QString idString, qreal width, ChatView *parent); ~ChatScene() override; inline QAbstractItemModel *model() const { return _model; } diff --git a/src/qtui/qtuimessageprocessor.h b/src/qtui/qtuimessageprocessor.h index d6d39f38..bf437660 100644 --- a/src/qtui/qtuimessageprocessor.h +++ b/src/qtui/qtuimessageprocessor.h @@ -22,6 +22,7 @@ #define QTUIMESSAGEPROCESSOR_H_ #include +#include #include "abstractmessageprocessor.h" #include "expressionmatch.h" @@ -89,8 +90,8 @@ private: */ LegacyHighlightRule(QString contents, bool isRegEx, bool isCaseSensitive, bool isEnabled, QString chanName) - : _contents(contents), _isRegEx(isRegEx), _isCaseSensitive(isCaseSensitive), - _isEnabled(isEnabled), _chanName(chanName) + : _contents(std::move(contents)), _isRegEx(isRegEx), _isCaseSensitive(isCaseSensitive), + _isEnabled(isEnabled), _chanName(std::move(chanName)) { _cacheInvalid = true; // Cache expression matches on construction diff --git a/src/qtui/settingspages/bufferviewsettingspage.cpp b/src/qtui/settingspages/bufferviewsettingspage.cpp index 7323697b..3a4da10c 100644 --- a/src/qtui/settingspages/bufferviewsettingspage.cpp +++ b/src/qtui/settingspages/bufferviewsettingspage.cpp @@ -21,6 +21,7 @@ #include "bufferviewsettingspage.h" #include +#include #include "buffermodel.h" #include "bufferviewconfig.h" @@ -576,7 +577,7 @@ BufferViewConfig *BufferViewSettingsPage::configForDisplay(BufferViewConfig *con /************************************************************************** * BufferViewEditDlg *************************************************************************/ -BufferViewEditDlg::BufferViewEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) +BufferViewEditDlg::BufferViewEditDlg(const QString &old, QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist)) { ui.setupUi(this); diff --git a/src/qtui/settingspages/bufferviewsettingspage.h b/src/qtui/settingspages/bufferviewsettingspage.h index f78288b7..dbe47d1a 100644 --- a/src/qtui/settingspages/bufferviewsettingspage.h +++ b/src/qtui/settingspages/bufferviewsettingspage.h @@ -94,7 +94,7 @@ class BufferViewEditDlg : public QDialog Q_OBJECT public: - BufferViewEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = nullptr); + BufferViewEditDlg(const QString &old, QStringList existing = QStringList(), QWidget *parent = nullptr); inline QString bufferViewName() const { return ui.bufferViewEdit->text(); } diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp index 71e48cfd..15e584ad 100644 --- a/src/qtui/settingspages/identitiessettingspage.cpp +++ b/src/qtui/settingspages/identitiessettingspage.cpp @@ -22,6 +22,7 @@ #include #include +#include #include "client.h" #include "icon.h" @@ -464,8 +465,8 @@ void SaveIdentitiesDlg::clientEvent() /*************************************************************************************************/ -NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent) - : QDialog(parent), oldNick(old), existing(exist) +NickEditDlg::NickEditDlg(const QString &old, QStringList exist, QWidget *parent) + : QDialog(parent), oldNick(old), existing(std::move(exist)) { ui.setupUi(this); diff --git a/src/qtui/settingspages/identityeditwidget.h b/src/qtui/settingspages/identityeditwidget.h index 07a62ad5..19c67748 100644 --- a/src/qtui/settingspages/identityeditwidget.h +++ b/src/qtui/settingspages/identityeditwidget.h @@ -98,7 +98,7 @@ class NickEditDlg : public QDialog Q_OBJECT public: - NickEditDlg(const QString &oldnick, const QStringList &existing = QStringList(), QWidget *parent = nullptr); + NickEditDlg(const QString &oldnick, QStringList existing = QStringList(), QWidget *parent = nullptr); QString nick() const; diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index 478acd14..afc4698e 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "networkssettingspage.h" @@ -1029,7 +1030,7 @@ IdentityId NetworksSettingsPage::defaultIdentity() const * NetworkAddDlg *************************************************************************/ -NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) +NetworkAddDlg::NetworkAddDlg(QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist)) { ui.setupUi(this); ui.useSSL->setIcon(icon::get("document-encrypt")); @@ -1121,7 +1122,7 @@ void NetworkAddDlg::updateSslPort(bool isChecked) * NetworkEditDlg *************************************************************************/ -NetworkEditDlg::NetworkEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) +NetworkEditDlg::NetworkEditDlg(const QString &old, QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist)) { ui.setupUi(this); diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h index 5c9db112..461c3e0d 100644 --- a/src/qtui/settingspages/networkssettingspage.h +++ b/src/qtui/settingspages/networkssettingspage.h @@ -166,7 +166,7 @@ class NetworkAddDlg : public QDialog Q_OBJECT public: - NetworkAddDlg(const QStringList &existing = QStringList(), QWidget *parent = nullptr); + NetworkAddDlg(QStringList existing = QStringList(), QWidget *parent = nullptr); NetworkInfo networkInfo() const; @@ -195,7 +195,7 @@ class NetworkEditDlg : public QDialog Q_OBJECT public: - NetworkEditDlg(const QString &old, const QStringList &existing = QStringList(), QWidget *parent = nullptr); + NetworkEditDlg(const QString &old, QStringList existing = QStringList(), QWidget *parent = nullptr); QString networkName() const; diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp index 070b1d85..4c4537ed 100644 --- a/src/uisupport/aboutdata.cpp +++ b/src/uisupport/aboutdata.cpp @@ -21,15 +21,16 @@ #include "aboutdata.h" #include +#include #include "quassel.h" -AboutPerson::AboutPerson(const QString &name, const QString &nick, const QString &task, const QString &emailAddress, QLocale::Language translatedLanguage) - : _name(name) - , _nick(nick) - , _task(task) - , _emailAddress(emailAddress) +AboutPerson::AboutPerson(QString name, QString nick, QString task, QString emailAddress, QLocale::Language translatedLanguage) + : _name(std::move(name)) + , _nick(std::move(nick)) + , _task(std::move(task)) + , _emailAddress(std::move(emailAddress)) , _language(translatedLanguage) { diff --git a/src/uisupport/aboutdata.h b/src/uisupport/aboutdata.h index de27cbb4..072bcb7d 100644 --- a/src/uisupport/aboutdata.h +++ b/src/uisupport/aboutdata.h @@ -48,7 +48,7 @@ public: * @param[in] emailAddress The person's email address, if applicable * @param[in] translatedLanguage The language the person helped translate (only applicable for translators) */ - AboutPerson(const QString &name, const QString &nick, const QString &task, const QString &emailAddress = QString(), QLocale::Language translatedLanguage = QLocale::C); + AboutPerson(QString name, QString nick, QString task, QString emailAddress = QString(), QLocale::Language translatedLanguage = QLocale::C); /** * Gets the person's name. diff --git a/src/uisupport/abstractnotificationbackend.h b/src/uisupport/abstractnotificationbackend.h index 3655d958..86d09736 100644 --- a/src/uisupport/abstractnotificationbackend.h +++ b/src/uisupport/abstractnotificationbackend.h @@ -24,6 +24,7 @@ #include #include +#include #include "bufferinfo.h" @@ -48,8 +49,8 @@ public: QString sender; QString message; - Notification(uint id_, BufferId buf_, NotificationType type_, const QString &sender_, const QString &msg_) - : notificationId(id_), bufferId(buf_), type(type_), sender(sender_), message(msg_) {}; + Notification(uint id_, BufferId buf_, NotificationType type_, QString sender_, QString msg_) + : notificationId(id_), bufferId(buf_), type(type_), sender(std::move(sender_)), message(std::move(msg_)) {}; }; inline AbstractNotificationBackend(QObject *parent) : QObject(parent) {}; diff --git a/src/uisupport/settingspage.cpp b/src/uisupport/settingspage.cpp index 9be56bd9..ed48f079 100644 --- a/src/uisupport/settingspage.cpp +++ b/src/uisupport/settingspage.cpp @@ -24,15 +24,16 @@ #include #include #include +#include #include "fontselector.h" #include "uisettings.h" -SettingsPage::SettingsPage(const QString &category, const QString &title, QWidget *parent) +SettingsPage::SettingsPage(QString category, QString title, QWidget *parent) : QWidget(parent), - _category(category), - _title(title), + _category(std::move(category)), + _title(std::move(title)), _changed(false), _autoWidgetsChanged(false) { diff --git a/src/uisupport/settingspage.h b/src/uisupport/settingspage.h index 57bcfece..fe71d739 100644 --- a/src/uisupport/settingspage.h +++ b/src/uisupport/settingspage.h @@ -61,7 +61,7 @@ class UISUPPORT_EXPORT SettingsPage : public QWidget Q_OBJECT public: - SettingsPage(const QString &category, const QString &name, QWidget *parent = nullptr); + SettingsPage(QString category, QString name, QWidget *parent = nullptr); ~SettingsPage() override {}; //! The category of this settings page. diff --git a/src/uisupport/uisettings.cpp b/src/uisupport/uisettings.cpp index 7e19e20a..dc1199a8 100644 --- a/src/uisupport/uisettings.cpp +++ b/src/uisupport/uisettings.cpp @@ -20,6 +20,8 @@ #include "uisettings.h" +#include + #include "action.h" #include "actioncollection.h" @@ -70,8 +72,8 @@ QList UiStyleSettings::availableFormats() * SessionSettings **************************************************************************/ -SessionSettings::SessionSettings(const QString &sessionId, const QString &group) - : UiSettings(group), _sessionId(sessionId) +SessionSettings::SessionSettings(QString sessionId, const QString &group) + : UiSettings(group), _sessionId(std::move(sessionId)) { } diff --git a/src/uisupport/uisettings.h b/src/uisupport/uisettings.h index e597e592..c90f9089 100644 --- a/src/uisupport/uisettings.h +++ b/src/uisupport/uisettings.h @@ -62,7 +62,7 @@ public: class UISUPPORT_EXPORT SessionSettings : public UiSettings { public: - SessionSettings(const QString &sessionId, const QString &group = "Session"); + SessionSettings(QString sessionId, const QString &group = "Session"); void setValue(const QString &key, const QVariant &data) override; QVariant value(const QString &key, const QVariant &def = QVariant()) override; -- 2.20.1