Unity API

Merge lp:~aacid/unity-api/add_suggest-override into lp:unity-api

  1. add_suggest-override
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 261
Merged at revision: 262
Proposed branch: lp:~aacid/unity-api/add_suggest-override
Merge into: lp:unity-api
Diff against target: 398 lines (+73/-66)
20 files modified
CMakeLists.txt (+4/-0)
include/unity/Exception.h (+1/-1)
include/unity/shell/launcher/LauncherModelInterface.h (+1/-1)
include/unity/shell/launcher/QuickListModelInterface.h (+1/-1)
test/gtest/libgtest/CMakeLists.txt (+3/-0)
test/gtest/unity/Exceptions_test.cpp (+1/-1)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+6/-6)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h (+12/-12)
test/qmltest/mocks/plugins/Unity/Application/TestApplicationPlugin.h (+1/-1)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h (+13/-13)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h (+13/-13)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.h (+2/-2)
test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.h (+1/-1)
test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockActionModel.h (+3/-3)
test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockModel.h (+5/-5)
test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockNotificationsPlugin.h (+1/-1)
test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockSource.h (+2/-2)
test/qmltest/mocks/plugins/Unity/Notifications/TestNotificationsPlugin.h (+1/-1)
test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.h (+1/-1)
test/qmltest/modules/TestUtil/TestUtilPlugin.h (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity-api/add_suggest-override
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Lukáš Tinkl (community) Approve
Gerry Boland (community) code Approve
Review via email: mp+313244@code.launchpad.net

Commit message

Enable -Wsuggest-override

And add the override it suggests

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Looks good to me. If CI passes it, it should be good to go

review: Approve (code)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Yup, goot catch!

Let's hope CI still works here

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:259
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/121/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3559
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3587
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3432
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3432/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3432
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3432/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3432
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3432/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3432
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3432/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3432
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3432/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3432
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3432/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/121/rebuild

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:260
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/122/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3560
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3588
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3434
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3434/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3434
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3434/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3434
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3434/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3434
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3434/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3434
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3434/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3434
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3434/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/122/rebuild

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:261
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/129/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3670
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3698
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3540
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3540/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3540
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3540/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3540
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3540/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3540
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3540/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3540
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3540/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3540
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3540/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/129/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-08-02 00:40:57 +0000
3+++ CMakeLists.txt 2016-12-23 08:50:48 +0000
4@@ -106,6 +106,10 @@
5 # -fno-permissive causes warnings with clang, so we only enable it for gcc
6 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
7 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-permissive")
8+
9+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
10+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
11+ endif()
12 endif()
13
14 if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
15
16=== modified file 'include/unity/Exception.h'
17--- include/unity/Exception.h 2013-12-16 22:25:20 +0000
18+++ include/unity/Exception.h 2016-12-23 08:50:48 +0000
19@@ -109,7 +109,7 @@
20 virtual ~Exception() noexcept;
21 //! @endcond
22
23- virtual char const* what() const noexcept;
24+ char const* what() const noexcept override;
25
26 /**
27 \brief Returns a <code>std::exception_ptr</code> to <code>this</code>.
28
29=== modified file 'include/unity/shell/launcher/LauncherModelInterface.h'
30--- include/unity/shell/launcher/LauncherModelInterface.h 2016-05-18 13:43:40 +0000
31+++ include/unity/shell/launcher/LauncherModelInterface.h 2016-12-23 08:50:48 +0000
32@@ -166,7 +166,7 @@
33 virtual bool onlyPinned() const = 0;
34 virtual void setOnlyPinned(bool onlyPinned) = 0;
35
36- virtual QHash<int, QByteArray> roleNames() const
37+ QHash<int, QByteArray> roleNames() const override
38 {
39 return m_roleNames;
40 }
41
42=== modified file 'include/unity/shell/launcher/QuickListModelInterface.h'
43--- include/unity/shell/launcher/QuickListModelInterface.h 2016-10-28 11:14:37 +0000
44+++ include/unity/shell/launcher/QuickListModelInterface.h 2016-12-23 08:50:48 +0000
45@@ -71,7 +71,7 @@
46 /// @endcond
47
48 /// @cond
49- QHash<int, QByteArray> roleNames() const {
50+ QHash<int, QByteArray> roleNames() const override {
51 return m_roleNames;
52 }
53 /// @endcond
54
55=== modified file 'test/gtest/libgtest/CMakeLists.txt'
56--- test/gtest/libgtest/CMakeLists.txt 2013-10-21 04:34:38 +0000
57+++ test/gtest/libgtest/CMakeLists.txt 2016-12-23 08:50:48 +0000
58@@ -2,6 +2,9 @@
59 set(GTEST_ROOT /usr/src/gtest)
60 endif()
61
62+# Do not use -Wsuggest-override here, we can't fix gtest
63+string (REPLACE "-Wsuggest-override" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
64+
65 set(GTEST_SRC_DIR "${GTEST_ROOT}/src")
66 set(GTEST_INCLUDE_DIR ${GTEST_ROOT})
67
68
69=== modified file 'test/gtest/unity/Exceptions_test.cpp'
70--- test/gtest/unity/Exceptions_test.cpp 2013-12-13 04:07:41 +0000
71+++ test/gtest/unity/Exceptions_test.cpp 2016-12-23 08:50:48 +0000
72@@ -111,7 +111,7 @@
73 class E : public std::exception, public nested_exception
74 {
75 public:
76- virtual char const* what() const noexcept
77+ char const* what() const noexcept override
78 {
79 return "E";
80 }
81
82=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
83--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2016-11-17 12:23:32 +0000
84+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2016-12-23 08:50:48 +0000
85@@ -31,15 +31,15 @@
86
87 void close() override {}
88
89- QString appId() const;
90- QString name() const;
91- QString comment() const;
92- QUrl icon() const;
93+ QString appId() const override;
94+ QString name() const override;
95+ QString comment() const override;
96+ QUrl icon() const override;
97
98- ApplicationInfoInterface::State state() const;
99+ ApplicationInfoInterface::State state() const override;
100 void setState(ApplicationInfoInterface::State state);
101
102- bool focused() const;
103+ bool focused() const override;
104 void setFocused(bool focused);
105
106 QString splashTitle() const override;
107
108=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h'
109--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h 2016-12-07 11:23:57 +0000
110+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h 2016-12-23 08:50:48 +0000
111@@ -34,27 +34,27 @@
112 MockApplicationManager(QObject* parent = 0);
113 ~MockApplicationManager();
114
115- int rowCount(const QModelIndex& parent) const;
116-
117- QVariant data(const QModelIndex& index, int role) const;
118-
119- QString focusedApplicationId() const;
120-
121- Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const;
122-
123- Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const;
124+ int rowCount(const QModelIndex& parent) const override;
125+
126+ QVariant data(const QModelIndex& index, int role) const override;
127+
128+ QString focusedApplicationId() const override;
129+
130+ Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const override;
131+
132+ Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const override;
133
134 ApplicationInfoInterface *findApplicationWithSurface(MirSurfaceInterface*) const override { return nullptr; }
135
136- Q_INVOKABLE bool requestFocusApplication(const QString &appId);
137+ Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
138
139 Q_INVOKABLE bool focusApplication(const QString &appId);
140
141 Q_INVOKABLE void unfocusCurrentApplication();
142
143- Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *startApplication(const QString &appId, const QStringList &arguments);
144+ Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *startApplication(const QString &appId, const QStringList &arguments) override;
145
146- Q_INVOKABLE bool stopApplication(const QString &appId);
147+ Q_INVOKABLE bool stopApplication(const QString &appId) override;
148
149 private:
150 QList<MockApplicationInfo*> m_list;
151
152=== modified file 'test/qmltest/mocks/plugins/Unity/Application/TestApplicationPlugin.h'
153--- test/qmltest/mocks/plugins/Unity/Application/TestApplicationPlugin.h 2013-08-29 12:54:56 +0000
154+++ test/qmltest/mocks/plugins/Unity/Application/TestApplicationPlugin.h 2016-12-23 08:50:48 +0000
155@@ -29,7 +29,7 @@
156 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
157
158 public:
159- void registerTypes(const char* uri);
160+ void registerTypes(const char* uri) override;
161 };
162
163 #endif // TESTAPPLICATION_PLUGIN_H
164
165=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h'
166--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h 2016-11-17 11:45:57 +0000
167+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h 2016-12-23 08:50:48 +0000
168@@ -32,40 +32,40 @@
169 public:
170 MockLauncherItem(const QString &appId, const QString& desktopFile, const QString& name, const QString& icon, QObject* parent = 0);
171
172- QString appId() const;
173+ QString appId() const override;
174 QString desktopFile() const;
175- QString name() const;
176- QString icon() const;
177+ QString name() const override;
178+ QString icon() const override;
179
180- QStringList keywords() const;
181+ QStringList keywords() const override;
182 void setKeywords(const QStringList &keywords);
183
184- bool pinned() const;
185+ bool pinned() const override;
186 void setPinned(bool pinned);
187
188- bool running() const;
189+ bool running() const override;
190 void setRunning(bool running);
191
192- bool recent() const;
193+ bool recent() const override;
194 void setRecent(bool recent);
195
196- int progress() const;
197+ int progress() const override;
198 void setProgress(int progress);
199
200- int count() const;
201+ int count() const override;
202 void setCount(int count);
203
204- bool countVisible() const;
205+ bool countVisible() const override;
206 void setCountVisible(bool countVisible);
207
208- bool focused() const;
209+ bool focused() const override;
210 void setFocused(bool focused);
211
212- bool alerting() const;
213+ bool alerting() const override;
214
215 int surfaceCount() const override;
216
217- unity::shell::launcher::QuickListModelInterface *quickList() const;
218+ unity::shell::launcher::QuickListModelInterface *quickList() const override;
219
220 private:
221 QString m_appId;
222
223=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h'
224--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h 2016-05-18 13:43:40 +0000
225+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.h 2016-12-23 08:50:48 +0000
226@@ -35,19 +35,19 @@
227 MockLauncherModel(QObject* parent = 0);
228 ~MockLauncherModel();
229
230- int rowCount(const QModelIndex& parent) const;
231-
232- QVariant data(const QModelIndex& index, int role) const;
233-
234- Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const;
235- Q_INVOKABLE void move(int oldIndex, int newIndex);
236- Q_INVOKABLE void pin(const QString &appId, int index = -1);
237- Q_INVOKABLE void requestRemove(const QString &appId);
238- Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
239- Q_INVOKABLE void setUser(const QString &user);
240-
241- unity::shell::application::ApplicationManagerInterface *applicationManager() const;
242- void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
243+ int rowCount(const QModelIndex& parent) const override;
244+
245+ QVariant data(const QModelIndex& index, int role) const override;
246+
247+ Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const override;
248+ Q_INVOKABLE void move(int oldIndex, int newIndex) override;
249+ Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
250+ Q_INVOKABLE void requestRemove(const QString &appId) override;
251+ Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex) override;
252+ Q_INVOKABLE void setUser(const QString &user) override;
253+
254+ unity::shell::application::ApplicationManagerInterface *applicationManager() const override;
255+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager) override;
256
257 bool onlyPinned() const override;
258 void setOnlyPinned(bool onlyPinned) override;
259
260=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.h'
261--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.h 2013-07-04 17:17:46 +0000
262+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.h 2016-12-23 08:50:48 +0000
263@@ -30,9 +30,9 @@
264 public:
265 MockQuickListModel(QObject *parent = 0);
266
267- QVariant data(const QModelIndex &index, int role) const;
268+ QVariant data(const QModelIndex &index, int role) const override;
269
270- int rowCount(const QModelIndex &parent = QModelIndex()) const;
271+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
272 };
273
274 #endif // MOCKQUICKLISTMODEL_H
275
276=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.h'
277--- test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.h 2013-06-11 10:42:07 +0000
278+++ test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.h 2016-12-23 08:50:48 +0000
279@@ -29,7 +29,7 @@
280 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
281
282 public:
283- void registerTypes(const char* uri);
284+ void registerTypes(const char* uri) override;
285 };
286
287 #endif // TESTLAUNCHER_PLUGIN_H
288
289=== modified file 'test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockActionModel.h'
290--- test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockActionModel.h 2013-06-26 23:47:34 +0000
291+++ test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockActionModel.h 2016-12-23 08:50:48 +0000
292@@ -35,9 +35,9 @@
293 public:
294 explicit MockActionModel(QObject *parent = 0);
295
296- int rowCount(const QModelIndex& parent) const;
297- QVariant data(const QModelIndex &index, int role) const;
298- QHash<int, QByteArray> roleNames() const;
299+ int rowCount(const QModelIndex& parent) const override;
300+ QVariant data(const QModelIndex &index, int role) const override;
301+ QHash<int, QByteArray> roleNames() const override;
302
303 enum RoleEnum
304 {
305
306=== modified file 'test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockModel.h'
307--- test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockModel.h 2013-06-26 23:47:34 +0000
308+++ test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockModel.h 2016-12-23 08:50:48 +0000
309@@ -41,16 +41,16 @@
310 public:
311 MockModel(QObject* parent = 0);
312
313- int rowCount(const QModelIndex &parent = QModelIndex()) const;
314- QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
315- QHash<int, QByteArray> roleNames() const;
316+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
317+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
318+ QHash<int, QByteArray> roleNames() const override;
319
320- bool confirmationPlaceholder() const
321+ bool confirmationPlaceholder() const override
322 {
323 return m_confirmationPlaceholder;
324 }
325
326- void setConfirmationPlaceholder(bool confirmationPlaceholder);
327+ void setConfirmationPlaceholder(bool confirmationPlaceholder) override;
328
329 void add(MockNotification* notification);
330
331
332=== modified file 'test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockNotificationsPlugin.h'
333--- test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockNotificationsPlugin.h 2013-06-26 23:47:34 +0000
334+++ test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockNotificationsPlugin.h 2016-12-23 08:50:48 +0000
335@@ -29,7 +29,7 @@
336 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
337
338 public:
339- void registerTypes(const char *uri);
340+ void registerTypes(const char *uri) override;
341 };
342
343 #endif // MOCKNOTIFICATIONSPLUGIN_H
344
345=== modified file 'test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockSource.h'
346--- test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockSource.h 2013-06-26 23:47:34 +0000
347+++ test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockSource.h 2016-12-23 08:50:48 +0000
348@@ -50,9 +50,9 @@
349 public:
350 explicit MockSource(QObject *parent = 0);
351
352- ModelInterface* model() const;
353+ ModelInterface* model() const override;
354
355- void setModel(ModelInterface* model);
356+ void setModel(ModelInterface* model) override;
357
358 Q_INVOKABLE void send(QVariantMap data);
359
360
361=== modified file 'test/qmltest/mocks/plugins/Unity/Notifications/TestNotificationsPlugin.h'
362--- test/qmltest/mocks/plugins/Unity/Notifications/TestNotificationsPlugin.h 2013-06-26 23:47:34 +0000
363+++ test/qmltest/mocks/plugins/Unity/Notifications/TestNotificationsPlugin.h 2016-12-23 08:50:48 +0000
364@@ -29,7 +29,7 @@
365 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
366
367 public:
368- void registerTypes(const char *uri);
369+ void registerTypes(const char *uri) override;
370 };
371
372 #endif // TESTNOTIFICATIONS_PLUGIN_H
373
374=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.h'
375--- test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.h 2014-05-13 13:52:12 +0000
376+++ test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.h 2016-12-23 08:50:48 +0000
377@@ -26,7 +26,7 @@
378 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
379
380 public:
381- void registerTypes(const char* uri);
382+ void registerTypes(const char* uri) override;
383 };
384
385 #endif
386
387=== modified file 'test/qmltest/modules/TestUtil/TestUtilPlugin.h'
388--- test/qmltest/modules/TestUtil/TestUtilPlugin.h 2013-06-26 23:47:34 +0000
389+++ test/qmltest/modules/TestUtil/TestUtilPlugin.h 2016-12-23 08:50:48 +0000
390@@ -26,7 +26,7 @@
391 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
392
393 public:
394- void registerTypes(const char *uri);
395+ void registerTypes(const char *uri) override;
396 };
397
398 #endif // TESTUTIL_PLUGIN_H

Subscribers

People subscribed via source and target branches

to all changes: