30179a3 · unity8 · git.iko.soy

plugins/Ubuntu/Gestures/TouchGestureArea.h+1−1

compare with xenial

unifiedsplit

@@ -175,7 +175,7 @@ Q_SIGNALS:

175 void clicked();

176

177protected:

178− void itemChange(ItemChange change, const ItemChangeData &value);

178+ void itemChange(ItemChange change, const ItemChangeData &value) override;

179

180private Q_SLOTS:

181 void rejectGesture();

plugins/Unity/InputInfo/plugin.h+1−1

@@ -24,7 +24,7 @@ class InputInfoPlugin : public QQmlExtensionPlugin

24 Q_OBJECT

25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

26public:

27− void registerTypes(const char *uri);

27+ void registerTypes(const char *uri) override;

28};

29

30#endif // INPUTINFO_PLUGIN_H

plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h+3−3

@@ -69,8 +69,8 @@ public:

69 explicit QDeclarativeInputDeviceModel(QObject *parent = 0);

70 virtual ~QDeclarativeInputDeviceModel();

71

72− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

72+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

73− int rowCount(const QModelIndex &parent = QModelIndex()) const;

73+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

74

75 void setDeviceFilter(QInputDevice::InputType filter);

76 QInputDevice::InputType deviceFilter();

@@ -78,7 +78,7 @@ public:

78 Q_INVOKABLE int indexOf(const QString &devicePath) const;

79

80 Q_INVOKABLE QInputDevice *get(int index) const;

81− QHash<int, QByteArray> roleNames() const;

81+ QHash<int, QByteArray> roleNames() const override;

82

83Q_SIGNALS:

84 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

61public:

62 GSettingsQml(QObject *parent = nullptr);

63

64− void classBegin();

64+ void classBegin() override;

65− void componentComplete();

65+ void componentComplete() override;

66

67 GSettingsSchemaQml * schema() const;

68 QVariant disableHeight() const;

tests/mocks/Unity/Application/ApplicationInfo.h+1−1

@@ -67,7 +67,7 @@ public:

67

68 QUrl icon() const override { return m_icon; }

69

70− Q_INVOKABLE void setStage(Stage value); // invokable only for mock

70+ Q_INVOKABLE void setStage(Stage value) override; // invokable only for mock

71 Stage stage() const override { return m_stage; }

72

73 Q_INVOKABLE void setState(State value);

tests/mocks/Unity/Application/MirSurface.h+2−2

@@ -96,8 +96,8 @@ public:

96 int widthIncrement() const override { return m_widthIncrement; }

97 int heightIncrement() const override { return m_heightIncrement; }

98

99− virtual void setKeymap(const QString &);

99+ void setKeymap(const QString &) override;

100− virtual QString keymap() const;

100+ QString keymap() const override;

101

102 Mir::ShellChrome shellChrome() const override;

103

tests/mocks/Unity/InputInfo/plugin.h+1−1

@@ -24,7 +24,7 @@ class InputInfoPlugin : public QQmlExtensionPlugin

24 Q_OBJECT

25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

26public:

27− void registerTypes(const char *uri);

27+ void registerTypes(const char *uri) override;

28};

29

30#endif // INPUTINFO_PLUGIN_H

tests/mocks/Unity/Screens/plugin.h+1−1

@@ -21,5 +21,5 @@ class UnityScreensPlugin : public QQmlExtensionPlugin {

21 Q_OBJECT

22 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")

23public:

24− virtual void registerTypes(const char* uri);

24+ void registerTypes(const char* uri) override;

25};

tests/mocks/Utils/plugin.h+1−1

@@ -26,7 +26,7 @@ class FakeUtilsPlugin : public QQmlExtensionPlugin

26 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

27

28public:

29− void registerTypes(const char *uri);

29+ void registerTypes(const char *uri) override;

30};

31

32#endif