X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Faliasmanager.h;h=b061465c92b4d850aa0fe19e2f374fb70fb4804c;hp=c72f57dd19b0d37f0d5d1f65148f4ee43c392b09;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=7a44d67d565fe4f627e64b158a91a5978591c743

diff --git a/src/common/aliasmanager.h b/src/common/aliasmanager.h
index c72f57dd..b061465c 100644
--- a/src/common/aliasmanager.h
+++ b/src/common/aliasmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,67 +15,65 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef ALIASMANAGER_H
-#define ALIASMANAGER_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QVariantMap>
+#include <utility>
 
 #include "bufferinfo.h"
 #include "syncableobject.h"
 
 class Network;
 
-class AliasManager : public SyncableObject {
-  Q_OBJECT
+class COMMON_EXPORT AliasManager : public SyncableObject
+{
+    Q_OBJECT
+    SYNCABLE_OBJECT
 
 public:
-  inline AliasManager(QObject *parent = 0) : SyncableObject(parent) { setAllowClientUpdates(true); }
-  AliasManager &operator=(const AliasManager &other);
+    inline AliasManager(QObject *parent = nullptr) : SyncableObject(parent) { setAllowClientUpdates(true); }
+    AliasManager &operator=(const AliasManager &other);
 
-  struct Alias {
-    QString name;
-    QString expansion;
-    Alias(const QString &name_, const QString &expansion_) : name(name_), expansion(expansion_) {}
-  };
-  typedef QList<Alias> AliasList ;
+    struct Alias {
+        QString name;
+        QString expansion;
+        Alias(QString name_, QString expansion_) : name(std::move(name_)), expansion(std::move(expansion_)) {}
+    };
+    using AliasList = QList<Alias>;
 
-  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; }
+    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; }
 
-  static AliasList defaults();
+    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 QVariantMap initAliases() const;
+    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
-
-signals:
-  void aliasAdded(const QString &name, const QString &expansion);
+    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);
-
-  AliasList _aliases;
+    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