X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fignorelistmodel.h;h=262358b53036373aa990e217dfa05635783dfa48;hp=4a9f9c6002f297291c0b385c697d5e9687a1cad4;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hpb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24

diff --git a/src/qtui/settingspages/ignorelistmodel.h b/src/qtui/settingspages/ignorelistmodel.h
index 4a9f9c60..262358b5 100644
--- a/src/qtui/settingspages/ignorelistmodel.h
+++ b/src/qtui/settingspages/ignorelistmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 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 IGNORELISTMODEL_H
-#define IGNORELISTMODEL_H
+#pragma once
+
+#include <memory>
 
 #include <QAbstractItemModel>
-#include <QPointer>
 
 #include "clientignorelistmanager.h"
 
@@ -31,29 +31,29 @@ class IgnoreListModel : public QAbstractItemModel
     Q_OBJECT
 
 public:
-    IgnoreListModel(QObject *parent = nullptr);
+    IgnoreListModel(QObject* parent = nullptr);
 
-    QVariant data(const QModelIndex &index, int role) const override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+    QVariant data(const QModelIndex& index, int role) const override;
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
 
-    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    Qt::ItemFlags flags(const QModelIndex& index) const override;
 
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
 
-    inline QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); }
+    inline QModelIndex parent(const QModelIndex&) const override { return {}; }
 
-    inline int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    inline int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    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>(_clonedIgnoreListManager); }
     inline bool isReady() const { return _modelReady; }
 
-    const IgnoreListManager::IgnoreListItem &ignoreListItemAt(int row) const;
-    void setIgnoreListItemAt(int row, const IgnoreListManager::IgnoreListItem &item);
-    bool newIgnoreRule(const IgnoreListManager::IgnoreListItem &item);
-    const QModelIndex indexOf(const QString &rule);
+    const IgnoreListManager::IgnoreListItem& ignoreListItemAt(int row) const;
+    void setIgnoreListItemAt(int row, const IgnoreListManager::IgnoreListItem& item);
+    bool newIgnoreRule(const IgnoreListManager::IgnoreListItem& item);
+    const QModelIndex indexOf(const QString& rule);
 
 public slots:
     void loadDefaults();
@@ -66,13 +66,12 @@ signals:
     void modelReady(bool);
 
 private:
-    ClientIgnoreListManager _clonedIgnoreListManager;
-    bool _configChanged;
-    bool _modelReady;
+    std::unique_ptr<ClientIgnoreListManager> _clonedIgnoreListManager;
+    bool _modelReady{false};
 
-    const IgnoreListManager &ignoreListManager() const;
-    IgnoreListManager &ignoreListManager();
-    IgnoreListManager &cloneIgnoreListManager();
+    const IgnoreListManager& ignoreListManager() const;
+    IgnoreListManager& ignoreListManager();
+    IgnoreListManager& cloneIgnoreListManager();
 
 private slots:
     void clientConnected();
@@ -80,20 +79,15 @@ private slots:
     void initDone();
 };
 
-
 // Inlines
-int IgnoreListModel::rowCount(const QModelIndex &parent) const
+int IgnoreListModel::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
     return isReady() ? ignoreListManager().count() : 0;
 }
 
-
-int IgnoreListModel::columnCount(const QModelIndex &parent) const
+int IgnoreListModel::columnCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
     return isReady() ? 3 : 0;
 }
-
-
-#endif //IGNORELISTMODEL_H