X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fshortcutsmodel.h;h=12420bdcb0bd237a848b4b989762f4c03e67b890;hb=6eefdfc697067d184a589fc8a231b16316c09106;hp=6e670216f1990c21af6e94e9270f7e9f63e2c25d;hpb=1cb02004ee5973b89368bd84f234d4652794690d;p=quassel.git

diff --git a/src/qtui/settingspages/shortcutsmodel.h b/src/qtui/settingspages/shortcutsmodel.h
index 6e670216..12420bdc 100644
--- a/src/qtui/settingspages/shortcutsmodel.h
+++ b/src/qtui/settingspages/shortcutsmodel.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  *
@@ -43,16 +43,16 @@ public:
         IsConfigurableRole
     };
 
-    ShortcutsModel(const QHash<QString, ActionCollection *> &actionCollections, QObject *parent = 0);
-    ~ShortcutsModel();
+    ShortcutsModel(const QHash<QString, ActionCollection *> &actionCollections, QObject *parent = nullptr);
+    ~ShortcutsModel() override;
 
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &child) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = ActiveShortcutRole);
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = ActiveShortcutRole) override;
 
 public slots:
     //! Load shortcuts from the ActionCollections
@@ -76,11 +76,11 @@ public slots:
 
 signals:
     //! Reflects the difference between model contents and the ActionCollections we loaded this from
-    void hasChanged(bool changed);
+    void changed(bool changed);
 
 private:
     struct Item {
-        inline Item() { parentItem = 0; collection = 0; action = 0; }
+        inline Item() { parentItem = nullptr; collection = nullptr; action = nullptr; }
         inline ~Item() { qDeleteAll(actionItems); }
         int row;
         Item *parentItem;