git.iko.soy/unity8
on xenial help sign in
Add override

Approved by: Daniel d'Andrada

commit30179a3b640a37844ae89ee21e8695b0cde18753 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 27 May 2016, 13:52 (10 years ago) parente32fe6ab74518e
9 files changed+13−13
compare with xenial
unifiedsplit
plugins/Ubuntu/Gestures/TouchGestureArea.h+1−1 plugins/Unity/InputInfo/plugin.h+1−1 plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h+3−3 tests/mocks/GSettings.1.0/fake_gsettings.h+2−2 tests/mocks/Unity/Application/ApplicationInfo.h+1−1 tests/mocks/Unity/Application/MirSurface.h+2−2 tests/mocks/Unity/InputInfo/plugin.h+1−1 tests/mocks/Unity/Screens/plugin.h+1−1 tests/mocks/Utils/plugin.h+1−1
plugins/Ubuntu/Gestures/TouchGestureArea.h+1−1
@@ -175,7 +175,7 @@ Q_SIGNALS:
175175 void clicked();
176176
177177protected:
178− void itemChange(ItemChange change, const ItemChangeData &value);
178+ void itemChange(ItemChange change, const ItemChangeData &value) override;
179179
180180private Q_SLOTS:
181181 void rejectGesture();
plugins/Unity/InputInfo/plugin.h+1−1
@@ -24,7 +24,7 @@ class InputInfoPlugin : public QQmlExtensionPlugin
2424 Q_OBJECT
2525 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2626public:
27− void registerTypes(const char *uri);
27+ void registerTypes(const char *uri) override;
2828};
2929
3030#endif // INPUTINFO_PLUGIN_H
plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h+3−3
@@ -69,8 +69,8 @@ public:
6969 explicit QDeclarativeInputDeviceModel(QObject *parent = 0);
7070 virtual ~QDeclarativeInputDeviceModel();
7171
72− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
73− int rowCount(const QModelIndex &parent = QModelIndex()) const;
72+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
73+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
7474
7575 void setDeviceFilter(QInputDevice::InputType filter);
7676 QInputDevice::InputType deviceFilter();
@@ -78,7 +78,7 @@ public:
7878 Q_INVOKABLE int indexOf(const QString &devicePath) const;
7979
8080 Q_INVOKABLE QInputDevice *get(int index) const;
81− QHash<int, QByteArray> roleNames() const;
81+ QHash<int, QByteArray> roleNames() const override;
8282
8383Q_SIGNALS:
8484 void deviceAdded(const QString &devicePath);
tests/mocks/GSettings.1.0/fake_gsettings.h+2−2
@@ -61,8 +61,8 @@ class GSettingsQml: public QObject, public QQmlParserStatus
6161public:
6262 GSettingsQml(QObject *parent = nullptr);
6363
64− void classBegin();
65− void componentComplete();
64+ void classBegin() override;
65+ void componentComplete() override;
6666
6767 GSettingsSchemaQml * schema() const;
6868 QVariant disableHeight() const;
tests/mocks/Unity/Application/ApplicationInfo.h+1−1
@@ -67,7 +67,7 @@ public:
6767
6868 QUrl icon() const override { return m_icon; }
6969
70− Q_INVOKABLE void setStage(Stage value); // invokable only for mock
70+ Q_INVOKABLE void setStage(Stage value) override; // invokable only for mock
7171 Stage stage() const override { return m_stage; }
7272
7373 Q_INVOKABLE void setState(State value);
tests/mocks/Unity/Application/MirSurface.h+2−2
@@ -96,8 +96,8 @@ public:
9696 int widthIncrement() const override { return m_widthIncrement; }
9797 int heightIncrement() const override { return m_heightIncrement; }
9898
99− virtual void setKeymap(const QString &);
100− virtual QString keymap() const;
99+ void setKeymap(const QString &) override;
100+ QString keymap() const override;
101101
102102 Mir::ShellChrome shellChrome() const override;
103103
tests/mocks/Unity/InputInfo/plugin.h+1−1
@@ -24,7 +24,7 @@ class InputInfoPlugin : public QQmlExtensionPlugin
2424 Q_OBJECT
2525 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2626public:
27− void registerTypes(const char *uri);
27+ void registerTypes(const char *uri) override;
2828};
2929
3030#endif // INPUTINFO_PLUGIN_H
tests/mocks/Unity/Screens/plugin.h+1−1
@@ -21,5 +21,5 @@ class UnityScreensPlugin : public QQmlExtensionPlugin {
2121 Q_OBJECT
2222 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
2323public:
24− virtual void registerTypes(const char* uri);
24+ void registerTypes(const char* uri) override;
2525};
tests/mocks/Utils/plugin.h+1−1
@@ -26,7 +26,7 @@ class FakeUtilsPlugin : public QQmlExtensionPlugin
2626 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2727
2828public:
29− void registerTypes(const char *uri);
29+ void registerTypes(const char *uri) override;
3030};
3131
3232#endif