X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fignorelistmanager.h;h=79acff65d7f5a370b62dea74517f7d1b01cb07fc;hp=3a3844fc65ee6f1f422804a741b07e374d212051;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad diff --git a/src/common/ignorelistmanager.h b/src/common/ignorelistmanager.h index 3a3844fc..79acff65 100644 --- a/src/common/ignorelistmanager.h +++ b/src/common/ignorelistmanager.h @@ -20,22 +20,24 @@ #pragma once -#include +#include "common-export.h" + #include #include #include +#include #include "expressionmatch.h" #include "message.h" #include "syncableobject.h" -class IgnoreListManager : public SyncableObject +class COMMON_EXPORT IgnoreListManager : public SyncableObject { Q_OBJECT SYNCABLE_OBJECT public: - inline IgnoreListManager(QObject *parent = 0) : SyncableObject(parent) { setAllowClientUpdates(true); } + inline IgnoreListManager(QObject *parent = nullptr) : SyncableObject(parent) { setAllowClientUpdates(true); } IgnoreListManager &operator=(const IgnoreListManager &other); enum IgnoreType { @@ -59,12 +61,12 @@ public: /** * Individual ignore list rule */ - class IgnoreListItem { + class COMMON_EXPORT IgnoreListItem { public: /** * Construct an empty ignore rule */ - IgnoreListItem() {} + IgnoreListItem() = default; /** * Construct an ignore rule with the given parameters @@ -80,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 @@ -332,7 +334,7 @@ public: mutable ExpressionMatch _ctcpSenderMatch = {}; ///< Expression match cache for CTCP nick }; - typedef QList IgnoreList; + using IgnoreList = QList; int indexOf(const QString &ignore) const; inline bool contains(const QString &ignore) const { return indexOf(ignore) != -1; }