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

diff --git a/src/qtui/settingspages/ignorelistmodel.h b/src/qtui/settingspages/ignorelistmodel.h
index 87b242a3..262358b5 100644
--- a/src/qtui/settingspages/ignorelistmodel.h
+++ b/src/qtui/settingspages/ignorelistmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,79 +15,79 @@
  *   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 IGNORELISTMODEL_H
-#define IGNORELISTMODEL_H
+#pragma once
+
+#include <memory>
 
 #include <QAbstractItemModel>
-#include <QPointer>
 
 #include "clientignorelistmanager.h"
 
-class IgnoreListModel : public QAbstractItemModel {
-  Q_OBJECT
+class IgnoreListModel : public QAbstractItemModel
+{
+    Q_OBJECT
 
 public:
-  IgnoreListModel(QObject *parent = 0);
+    IgnoreListModel(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 isReady() const { return _modelReady; }
+    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 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();
-  void removeIgnoreRule(int index);
-  void revert();
-  void commit();
+    void loadDefaults();
+    void removeIgnoreRule(int index);
+    void revert() override;
+    void commit();
 
 signals:
-  void configChanged(bool);
-  void modelReady(bool);
+    void configChanged(bool);
+    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();
-  void clientDisconnected();
-  void initDone();
+    void clientConnected();
+    void clientDisconnected();
+    void initDone();
 };
 
 // Inlines
-int IgnoreListModel::rowCount(const QModelIndex &parent) const {
-  Q_UNUSED(parent);
-  return isReady() ? ignoreListManager().count() : 0;
+int IgnoreListModel::rowCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+    return isReady() ? ignoreListManager().count() : 0;
 }
 
-int IgnoreListModel::columnCount(const QModelIndex &parent) const {
-  Q_UNUSED(parent);
-  return isReady() ? 3 : 0;
+int IgnoreListModel::columnCount(const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+    return isReady() ? 3 : 0;
 }
-    
-
-#endif //IGNORELISTMODEL_H