X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Faliasmanager.h;h=2ae16cc3e7ee1ab5cd7e13d1b25b21841b9f9743;hp=9257c0f6d00afc97db6174d937e5488b90401a4a;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3

diff --git a/src/common/aliasmanager.h b/src/common/aliasmanager.h
index 9257c0f6..2ae16cc3 100644
--- a/src/common/aliasmanager.h
+++ b/src/common/aliasmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef ALIASMANAGER_H
-#define ALIASMANAGER_H
+#pragma once
+
+#include "common-export.h"
+
+#include <utility>
 
 #include <QVariantMap>
 
@@ -28,53 +31,57 @@
 
 class Network;
 
-class AliasManager : public SyncableObject
+class COMMON_EXPORT AliasManager : public SyncableObject
 {
+    Q_OBJECT
     SYNCABLE_OBJECT
-        Q_OBJECT
 
 public:
-    inline AliasManager(QObject *parent = 0) : SyncableObject(parent) { setAllowClientUpdates(true); }
-    AliasManager &operator=(const AliasManager &other);
-
-    struct Alias {
+    inline AliasManager(QObject* parent = nullptr)
+        : SyncableObject(parent)
+    {
+        setAllowClientUpdates(true);
+    }
+
+    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_))
+        {}
     };
-    typedef QList<Alias> AliasList;
+    using AliasList = QList<Alias>;
 
-    int indexOf(const QString &name) const;
-    inline bool contains(const QString &name) const { return indexOf(name) != -1; }
+    int indexOf(const QString& name) const;
+    inline bool contains(const QString& name) const { return indexOf(name) != -1; }
     inline bool isEmpty() const { return _aliases.isEmpty(); }
     inline int count() const { return _aliases.count(); }
     inline void removeAt(int index) { _aliases.removeAt(index); }
-    inline Alias &operator[](int i) { return _aliases[i]; }
-    inline const Alias &operator[](int i) const { return _aliases.at(i); }
-    inline const AliasList &aliases() const { return _aliases; }
+    inline Alias& operator[](int i) { return _aliases[i]; }
+    inline const Alias& operator[](int i) const { return _aliases.at(i); }
+    inline const AliasList& aliases() const { return _aliases; }
 
     static AliasList defaults();
 
-    typedef QList<QPair<BufferInfo, QString> > CommandList;
+    using CommandList = QList<QPair<BufferInfo, QString>>;
 
-    CommandList processInput(const BufferInfo &info, const QString &message);
+    CommandList processInput(const BufferInfo& info, const QString& message);
 
 public slots:
     virtual QVariantMap initAliases() const;
-    virtual void initSetAliases(const QVariantMap &aliases);
+    virtual void initSetAliases(const QVariantMap& aliases);
 
-    virtual void addAlias(const QString &name, const QString &expansion);
+    virtual void addAlias(const QString& name, const QString& expansion);
 
 protected:
-    void setAliases(const QList<Alias> &aliases) { _aliases = aliases; }
-    virtual const Network *network(NetworkId) const = 0; // core and client require different access
+    void setAliases(const QList<Alias>& aliases) { _aliases = aliases; }
+    virtual const Network* network(NetworkId) const = 0;  // core and client require different access
 
 private:
-    void processInput(const BufferInfo &info, const QString &message, CommandList &previousCommands);
-    void expand(const QString &alias, const BufferInfo &bufferInfo, const QString &msg, CommandList &previousCommands);
+    void processInput(const BufferInfo& info, const QString& message, CommandList& previousCommands);
+    void expand(const QString& alias, const BufferInfo& bufferInfo, const QString& msg, CommandList& previousCommands);
 
     AliasList _aliases;
 };
-
-
-#endif //ALIASMANAGER_H