X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Faliasesmodel.h;h=3dc7f0d4cd7dc1ed7c9d2a085ed3af419a0d2217;hp=a7b85629f98d1f1d4f006681ead33a03a77f6258;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/qtui/settingspages/aliasesmodel.h b/src/qtui/settingspages/aliasesmodel.h
index a7b85629..3dc7f0d4 100644
--- a/src/qtui/settingspages/aliasesmodel.h
+++ b/src/qtui/settingspages/aliasesmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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,11 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef ALIASESMODEL_H
-#define ALIASESMODEL_H
+#pragma once
+
+#include <memory>
 
 #include <QAbstractItemModel>
-#include <QPointer>
 
 #include "clientaliasmanager.h"
 
@@ -31,30 +31,30 @@ class AliasesModel : public QAbstractItemModel
     Q_OBJECT
 
 public:
-    AliasesModel(QObject *parent = 0);
+    AliasesModel(QObject* parent = nullptr);
 
-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+    QVariant data(const QModelIndex& index, int role) const override;
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
 
-    inline QModelIndex parent(const QModelIndex &) const { return QModelIndex(); }
+    inline QModelIndex parent(const QModelIndex&) const override { return {}; }
 
-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    inline int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    inline int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    inline int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    inline bool configChanged() const { return _configChanged; }
+    inline bool hasConfigChanged() const { return static_cast<bool>(_clonedAliasManager); }
     inline bool isReady() const { return _modelReady; }
 
 public slots:
     void newAlias();
     void loadDefaults();
     void removeAlias(int index);
-    void revert();
+    void revert() override;
     void commit();
 
 signals:
@@ -62,13 +62,12 @@ signals:
     void modelReady(bool);
 
 private:
-    ClientAliasManager _clonedAliasManager;
-    bool _configChanged;
-    bool _modelReady;
+    std::unique_ptr<ClientAliasManager> _clonedAliasManager;
+    bool _modelReady{false};
 
-    const AliasManager &aliasManager() const;
-    AliasManager &aliasManager();
-    AliasManager &cloneAliasManager();
+    const AliasManager& aliasManager() const;
+    AliasManager& aliasManager();
+    AliasManager& cloneAliasManager();
 
 private slots:
     void clientConnected();
@@ -76,20 +75,15 @@ private slots:
     void initDone();
 };
 
-
 // Inlines
-int AliasesModel::rowCount(const QModelIndex &parent) const
+int AliasesModel::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
     return isReady() ? aliasManager().count() : 0;
 }
 
-
-int AliasesModel::columnCount(const QModelIndex &parent) const
+int AliasesModel::columnCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
     return isReady() ? 2 : 0;
 }
-
-
-#endif //ALIASESMODEL_H