X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fignorelistmodel.h;h=9a3a44b7b8635d52efbe51c0c85779c62fd504ae;hp=6065fb0db3cb884a993ede02778afb5f6e553361;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609 diff --git a/src/qtui/settingspages/ignorelistmodel.h b/src/qtui/settingspages/ignorelistmodel.h index 6065fb0d..9a3a44b7 100644 --- a/src/qtui/settingspages/ignorelistmodel.h +++ b/src/qtui/settingspages/ignorelistmodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 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 * @@ -31,23 +31,23 @@ 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 hasConfigChanged() const { return _configChanged; } inline bool isReady() const { return _modelReady; } const IgnoreListManager::IgnoreListItem &ignoreListItemAt(int row) const; @@ -58,7 +58,7 @@ public: public slots: void loadDefaults(); void removeIgnoreRule(int index); - void revert(); + void revert() override; void commit(); signals: @@ -67,8 +67,8 @@ signals: private: ClientIgnoreListManager _clonedIgnoreListManager; - bool _configChanged; - bool _modelReady; + bool _configChanged{false}; + bool _modelReady{false}; const IgnoreListManager &ignoreListManager() const; IgnoreListManager &ignoreListManager();