X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftreemodel.h;h=db7e5abb4c6316cffaad5655bdacca4e94731e3d;hp=716e07c924e5e8586c09bb86d1b1ff6808f9dedf;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf

diff --git a/src/client/treemodel.h b/src/client/treemodel.h
index 716e07c9..db7e5abb 100644
--- a/src/client/treemodel.h
+++ b/src/client/treemodel.h
@@ -43,7 +43,7 @@ public:
     };
     Q_DECLARE_FLAGS(TreeItemFlags, TreeItemFlag)
 
-    AbstractTreeItem(AbstractTreeItem *parent = 0);
+    AbstractTreeItem(AbstractTreeItem *parent = nullptr);
 
     bool newChild(AbstractTreeItem *child);
     bool newChilds(const QList<AbstractTreeItem *> &items);
@@ -83,7 +83,7 @@ signals:
     void endRemoveChilds();
 
 protected:
-    void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;
 
 private:
     QList<AbstractTreeItem *> _childItems;
@@ -106,13 +106,13 @@ class CLIENT_EXPORT SimpleTreeItem : public AbstractTreeItem
     Q_OBJECT
 
 public:
-    SimpleTreeItem(const QList<QVariant> &data, AbstractTreeItem *parent = 0);
-    virtual ~SimpleTreeItem();
+    SimpleTreeItem(QList<QVariant> data, AbstractTreeItem *parent = nullptr);
+    ~SimpleTreeItem() override;
 
-    virtual QVariant data(int column, int role) const;
-    virtual bool setData(int column, const QVariant &value, int role);
+    QVariant data(int column, int role) const override;
+    bool setData(int column, const QVariant &value, int role) override;
 
-    virtual int columnCount() const;
+    int columnCount() const override;
 
 private:
     QList<QVariant> _itemData;
@@ -127,15 +127,15 @@ class CLIENT_EXPORT PropertyMapItem : public AbstractTreeItem
     Q_OBJECT
 
 public:
-    PropertyMapItem(AbstractTreeItem *parent = 0);
+    PropertyMapItem(AbstractTreeItem *parent = nullptr);
 
     virtual QStringList propertyOrder() const = 0;
 
-    virtual QVariant data(int column, int role) const;
-    virtual bool setData(int column, const QVariant &value, int role);
+    QVariant data(int column, int role) const override;
+    bool setData(int column, const QVariant &value, int role) override;
 
     virtual QString toolTip(int column) const { Q_UNUSED(column) return QString(); }
-    virtual int columnCount() const;
+    int columnCount() const override;
 };
 
 
@@ -152,24 +152,24 @@ public:
         UserRole
     };
 
-    TreeModel(const QList<QVariant> &, QObject *parent = 0);
-    virtual ~TreeModel();
+    TreeModel(const QList<QVariant> &, QObject *parent = nullptr);
+    ~TreeModel() override;
 
     AbstractTreeItem *root() const;
 
-    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;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+    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;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
     QModelIndex indexByItem(AbstractTreeItem *item) const;
 
-    QModelIndex parent(const QModelIndex &index) const;
+    QModelIndex parent(const QModelIndex &index) const override;
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
     virtual void clear();