cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / src / qtui / settingspages / shortcutsmodel.h

diff --git a/src/qtui/settingspages/shortcutsmodel.h b/src/qtui/settingspages/shortcutsmodel.h
index a4a72da..8daf69c 100644 (file)
--- a/src/qtui/settingspages/shortcutsmodel.h
+++ b/src/qtui/settingspages/shortcutsmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,23 +36,24 @@ class ShortcutsModel : public QAbstractItemModel
 {
     Q_OBJECT
 public:
-    enum Role {
+    enum Role
+    {
         ActionRole = Qt::UserRole,
         DefaultShortcutRole,
         ActiveShortcutRole,
         IsConfigurableRole
     };
 
-    ShortcutsModel(const QHash<QString, ActionCollection *> &actionCollections, QObject *parent = nullptr);
-    ~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,23 +77,28 @@ 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 = nullptr; collection = nullptr; action = nullptr; }
+    struct Item
+    {
+        inline Item()
+        {
+            parentItem = nullptr;
+            collection = nullptr;
+            action = nullptr;
+        }
         inline ~Item() { qDeleteAll(actionItems); }
         int row;
-        Item *parentItem;
-        ActionCollection *collection;
-        Action *action;
+        Item* parentItem;
+        ActionCollection* collection;
+        Action* action;
         QKeySequence shortcut;
-        QList<Item *> actionItems;
+        QList<Item*> actionItems;
     };
 
-    QList<Item *> _categoryItems;
+    QList<Item*> _categoryItems;
     int _changedCount;
 };
 
-
-#endif // SHORTCUTSMODEL_H
+#endif  // SHORTCUTSMODEL_H