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

diff --git a/src/common/aliasmanager.h b/src/common/aliasmanager.h
index 240d9e5d..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,34 +15,36 @@
  *   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
+class COMMON_EXPORT AliasManager : public SyncableObject
 {
+    Q_OBJECT
     SYNCABLE_OBJECT
-        Q_OBJECT
 
 public:
-    inline AliasManager(QObject *parent = 0) : SyncableObject(parent) { setAllowClientUpdates(true); }
+    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_) {}
+        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; }
@@ -55,7 +57,7 @@ public:
 
     static AliasList defaults();
 
-    typedef QList<QPair<BufferInfo, QString> > CommandList;
+    using CommandList = QList<QPair<BufferInfo, QString>>;
 
     CommandList processInput(const BufferInfo &info, const QString &message);
 
@@ -75,6 +77,3 @@ private:
 
     AliasList _aliases;
 };
-
-
-#endif //ALIASMANAGER_H