modernize: Pass arguments by value and move in constructors

[quassel.git] / src / common / aliasmanager.h

diff --git a/src/common/aliasmanager.h b/src/common/aliasmanager.h
index a5646d8..b061465 100644 (file)
--- a/src/common/aliasmanager.h
+++ b/src/common/aliasmanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -18,31 +18,33 @@
  *   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