Merge lp:~aacid/unity8/add_override into lp:unity8

[Albert Astals Cid]

Add overrides to override functions

clang-modernize-3.6 -p=builddir -include=. -add-override

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, builds

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1753
http://jenkins.qa.ubuntu.com/job/unity8-ci/5648/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/813
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2559
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2559/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20075

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5648/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

I'm a fan of the 'override', a +1 from me

review: Approve

[lp:~aacid/unity8/add_override]

1755. By Launchpad Translations on behalf of unity-team on 2015-05-02

Launchpad automatic translations update.

1756. By Launchpad Translations on behalf of unity-team on 2015-05-03

Launchpad automatic translations update.

1757. By Launchpad Translations on behalf of unity-team on 2015-05-05

Launchpad automatic translations update.

1758. By Daniel d'Andrada on 2015-05-05

DirectionalDragArea: improvements & API grooming

-Simplified DirectionalDragArea gesture recognition
 * The widening angle property was dropped. Didn't really work
   as in real life swipes might start up in very different directions
   before finally turning to the final overall direction. That's specially
   bad when you have to conclude the recognition in a short amount
   of time so that you can still play animations to follow the user's finger
 * minSpeed as well. Went for a simpler way of expressing and evaluating it
   which is having maxTime and maxDistance.

-EdgeDragArea got absorbed by DirectionalDragArea

-Privatized all gesture recognition parameters.

-Privatized DirectionalDragArea.status property. All apps need is
 DirectionalDragArea.dragging. Modified qml code using DDA accordingly.

-Modified DirectionalDragArea.dragging semantics a bit. It goes to true only
 once a gesture is recognized

-Moved code that smooths out touch movement into DirectionalDragArea so all users
 get it for free.

-Cleaned up DirectionalDragArea.h of all implementation details, getting it ready
 to be moved out of unity8, into the SDK.

-Removed DirectionalDragArea.tapped() signal as it doesn't belong to it.

-Fine-tuned gesture recognition parameters and made them based on physical size.

-Added tests with input from real gestures to catch those annoying
  false-negatives and false-positives introduced by badly set recognition parameters

-Improved debug output

-UnownedTouchEvents are no longer sent to interim owners

-Fixed issue when TouchGate got disabled while holding an active touch

-Made "make tryDirectionalDragArea" and "make tryDragHandle" work with mouse again. Fixes: #1417920
Approved by: Michael Zanetti, Albert Astals Cid

1759. By Daniel d'Andrada on 2015-05-05

Fix EdgeDragEvaluator when a drag can happen both ways (Direction.Horizontal)
Approved by: Albert Astals Cid

1760. By Josh Arenson on 2015-05-05

Remove panelHeight property as it is unused.
Approved by: Albert Astals Cid

1761. By Michał Sawicz on 2015-05-05

UNITY_SCOPES_LIST is no more
Approved by: Pawel Stolowski, Albert Astals Cid

1762. By Leo Arias on 2015-05-05

Initial clean up of the autopilot tests set up.
- Removed the touch device from the test case.
- Moved the restart of unity to a fixture.
- Removed the unused DragMixin.
- Updated the setUpClass to use process_helpers.
- Removed the workaround for bug #1238417, already fixed.
- Use the toolkit helper to set the testability environment variable.
- Fixed the indicators base class that was restarting unity twice. Fixes: #1447206
Approved by: Albert Astals Cid

1763. By handsome_feng on 2015-05-05

When click the favorite scope in Dash Manager , it just return to the corresponding scope page. Fixes: #1447056
Approved by: Pawel Stolowski, Albert Astals Cid

1764. By Leo Arias on 2015-05-05

Use the base class from the toolkit in autopilot tests.
Approved by: Albert Astals Cid, Christopher Lee

1765. By Michael Zanetti on 2015-05-05

emit application-stop when we're going down Fixes: #1326513
Approved by: Albert Astals Cid

1766. By Albert Astals Cid on 2015-05-05

Make runtests fake a test error if make fails

This means that we will have 2 errors if there is a test that is run and fails, which is sub-optimal, but at least we'll have also a failure if the test doesn't fail because it was not run for example (i.e. missing dbus-launch).
Approved by: Michael Zanetti

1767. By Albert Astals Cid on 2015-05-05

Use dbus-test-runner instead of dbus-launch

Since we actually depend on it in the control file
Approved by: Michael Zanetti

1768. By Albert Astals Cid on 2015-05-05

Make the test more stable

The test was unstable because scrolling vs creation time is not always stable so at some point we were scrolling "too fast" and when deciding if the new item is out of viewport or in sometimes it went the other way.
Approved by: Michael Zanetti

1769. By CI Train Bot Account on 2015-05-05

Releasing 8.02+15.04.20150505-0ubuntu1

1770. By CI Train Bot Account on 2015-05-09

Resync trunk.

1771. By Launchpad Translations on behalf of unity-team on 2015-05-09

Launchpad automatic translations update.

1772. By Launchpad Translations on behalf of unity-team on 2015-05-11

Launchpad automatic translations update.

1773. By Albert Astals Cid on 2015-05-11

Workarounds for concierge mode.
Approved by: Pawel Stolowski, Michael Zanetti

1774. By CI Train Bot Account on 2015-05-11

Releasing 8.02+15.04.20150511-0ubuntu1

1775. By CI Train Bot Account on 2015-05-12

Resync trunk.

1776. By Launchpad Translations on behalf of unity-team on 2015-05-13

Launchpad automatic translations update.

1777. By Launchpad Translations on behalf of unity-team on 2015-05-15

Launchpad automatic translations update.

1778. By Nick Dedekind on 2015-05-18

Fixed desktop stage app focus.
Approved by: Daniel d'Andrada

1779. By Daniel d'Andrada on 2015-05-18

Introducing FloatingFlickable
Approved by: Michael Zanetti

1780. By Michael Terry on 2015-05-18

Fix a possible crash in our PAM threading code. (LP: #1425362)

So it was possible for a PAM subthread (which does the actual authenticating) to get mismatched state with the main thread. When this happened (i.e. when the subthread tried to use a pam_handle object that the main thread had already closed), a crash occurs. Like LP: #1425362.

So I've done a few cleanups here:
- Use a cancellable QConcurrent method (::mapped instead of ::run). Being able to cancel the thread is a stronger hammer than just hoping we answer all questions from the thread and it will close itself.
- We now block when the subthread sends a prompt request to the main thread. This makes handling those signals more predictable when we're trying to close the thread.
- We will process events while waiting for the subthread to close, so that we can actually process the above signals in the main thread.

I've added a dumb little test that tries to authenticate/cancel/authenticate 100 times in quick succession. Without this branch, we'd crash reliably anywhere from attempt 2 to 7. With this branch, we're fine all 100. Fixes: #1425362
Approved by: Albert Astals Cid

1781. By Michael Terry on 2015-05-18

Fix the lockscreen becoming unresponsive after testing an app on the device from QtCreator.

Using the hideGreeter dbus call got unity8 in a state where the greeter would try to call a method on an object that didn't exist at the time. Which meant it early-exited from a method before the greeter got re-enabled. Fixes: #1435364
Approved by: Daniel d'Andrada

1782. By Albert Astals Cid on 2015-05-18

Add overrides to override functions

clang-modernize-3.6 -p=builddir -include=. -add-override
Approved by: Gerry Boland

=== modified file 'plugins/AccountsService/plugin.h'
--- plugins/AccountsService/plugin.h	2013-08-22 14:54:08 +0000
+++ plugins/AccountsService/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Dash/plugin.h'
--- plugins/Dash/plugin.h	2014-04-30 10:06:33 +0000
+++ plugins/Dash/plugin.h	2015-05-11 07:50:04 +0000
@@ -27,7 +27,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.h'
--- plugins/Greeter/Unity/Launcher/launchermodelas.h	2015-02-11 14:02:24 +0000
+++ plugins/Greeter/Unity/Launcher/launchermodelas.h	2015-05-11 07:50:04 +0000
@@ -37,19 +37,19 @@
     LauncherModel(QObject *parent = 0);
     ~LauncherModel();
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
-    QVariant data(const QModelIndex &index, int role) const;
-
-    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;
-    Q_INVOKABLE void move(int oldIndex, int newIndex);
-    Q_INVOKABLE void pin(const QString &appId, int index = -1);
-    Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
-    Q_INVOKABLE void setUser(const QString &username);
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+
+    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
+    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
+    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
+    Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex) override;
+    Q_INVOKABLE void setUser(const QString &username) override;
     Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
 
-    unity::shell::application::ApplicationManagerInterface* applicationManager() const;
-    void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
+    unity::shell::application::ApplicationManagerInterface* applicationManager() const override;
+    void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager) override;
 
     bool onlyPinned() const override;
     void setOnlyPinned(bool onlyPinned) override;

=== modified file 'plugins/Greeter/Unity/Launcher/plugin.h'
--- plugins/Greeter/Unity/Launcher/plugin.h	2015-02-11 14:11:26 +0000
+++ plugins/Greeter/Unity/Launcher/plugin.h	2015-05-11 07:50:04 +0000
@@ -26,7 +26,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Greeter/Unity/Launcher/quicklistmodel.h'
--- plugins/Greeter/Unity/Launcher/quicklistmodel.h	2015-02-11 14:11:26 +0000
+++ plugins/Greeter/Unity/Launcher/quicklistmodel.h	2015-05-11 07:50:04 +0000
@@ -45,8 +45,8 @@
 
     QuickListEntry get(int index) const;
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
 private:
     QList<QuickListEntry> m_list;

=== modified file 'plugins/LightDM/UsersModel.cpp'
--- plugins/LightDM/UsersModel.cpp	2014-12-19 14:51:35 +0000
+++ plugins/LightDM/UsersModel.cpp	2015-05-11 07:50:04 +0000
@@ -32,7 +32,7 @@
 public:
     explicit MangleModel(QObject* parent=0);
 
-    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 };
 
 MangleModel::MangleModel(QObject* parent)

=== modified file 'plugins/LightDM/liblightdm/UsersModel.h'
--- plugins/LightDM/liblightdm/UsersModel.h	2015-01-20 11:50:19 +0000
+++ plugins/LightDM/liblightdm/UsersModel.h	2015-05-11 07:50:04 +0000
@@ -53,8 +53,8 @@
                          BackgroundPathRole
     };
 
-    int rowCount(const QModelIndex &parent) const;
-    QVariant data(const QModelIndex &index, int role) const;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
 private:
     UsersModelPrivate * const d_ptr;

=== modified file 'plugins/LightDM/plugin.h'
--- plugins/LightDM/plugin.h	2013-06-05 22:03:08 +0000
+++ plugins/LightDM/plugin.h	2015-05-11 07:50:04 +0000
@@ -29,7 +29,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Lights/plugin.h'
--- plugins/Lights/plugin.h	2014-07-03 12:35:13 +0000
+++ plugins/Lights/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Powerd/plugin.h'
--- plugins/Powerd/plugin.h	2013-08-02 16:18:28 +0000
+++ plugins/Powerd/plugin.h	2015-05-11 07:50:04 +0000
@@ -29,7 +29,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/ScreenGrabber/plugin.h'
--- plugins/ScreenGrabber/plugin.h	2014-09-27 02:16:11 +0000
+++ plugins/ScreenGrabber/plugin.h	2015-05-11 07:50:04 +0000
@@ -27,7 +27,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // SCREENGRABBER_PLUGIN_H

=== modified file 'plugins/SessionBroadcast/plugin.h'
--- plugins/SessionBroadcast/plugin.h	2013-09-18 20:59:03 +0000
+++ plugins/SessionBroadcast/plugin.h	2015-05-11 07:50:04 +0000
@@ -27,7 +27,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Ubuntu/DownloadDaemonListener/plugin.h'
--- plugins/Ubuntu/DownloadDaemonListener/plugin.h	2013-08-09 08:54:58 +0000
+++ plugins/Ubuntu/DownloadDaemonListener/plugin.h	2015-05-11 07:50:04 +0000
@@ -31,7 +31,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 };
 #endif // BACKEND_PLUGIN_H

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.h'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.h	2015-04-15 20:02:08 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.h	2015-05-11 07:50:04 +0000
@@ -125,8 +125,8 @@
     void immediateRecognitionChanged(bool value);
 
 protected:
-    virtual void touchEvent(QTouchEvent *event);
-    virtual void itemChange(ItemChange change, const ItemChangeData &value);
+    void touchEvent(QTouchEvent *event) override;
+    void itemChange(ItemChange change, const ItemChangeData &value) override;
 
 public: // so tests can access it
     DirectionalDragAreaPrivate *d;

=== modified file 'plugins/Ubuntu/Gestures/plugin.h'
--- plugins/Ubuntu/Gestures/plugin.h	2014-10-01 13:20:32 +0000
+++ plugins/Ubuntu/Gestures/plugin.h	2015-05-11 07:50:04 +0000
@@ -24,7 +24,7 @@
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 

=== modified file 'plugins/Ubuntu/Payments/plugin.h'
--- plugins/Ubuntu/Payments/plugin.h	2014-06-27 18:08:02 +0000
+++ plugins/Ubuntu/Payments/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // PAYMENTS_PLUGIN_H

=== modified file 'plugins/Ubuntu/SystemImage/plugin.h'
--- plugins/Ubuntu/SystemImage/plugin.h	2014-07-30 11:08:29 +0000
+++ plugins/Ubuntu/SystemImage/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // SYSTEMIMAGE_PLUGIN_H

=== modified file 'plugins/Unity/Connectivity/plugin.h'
--- plugins/Unity/Connectivity/plugin.h	2014-08-15 18:41:51 +0000
+++ plugins/Unity/Connectivity/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // CONNECTIVITY_PLUGIN_H

=== modified file 'plugins/Unity/DashCommunicator/plugin.h'
--- plugins/Unity/DashCommunicator/plugin.h	2014-07-24 16:02:27 +0000
+++ plugins/Unity/DashCommunicator/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Unity/Indicators/indicatorsmodel.h'
--- plugins/Unity/Indicators/indicatorsmodel.h	2014-11-17 23:04:48 +0000
+++ plugins/Unity/Indicators/indicatorsmodel.h	2015-05-11 07:50:04 +0000
@@ -50,11 +50,11 @@
     void setProfile(const QString& profile);
 
     /* QAbstractItemModel */
-    QHash<int, QByteArray> roleNames() const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    QModelIndex parent (const QModelIndex &index) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QHash<int, QByteArray> roleNames() const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QModelIndex parent (const QModelIndex &index) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
 
 Q_SIGNALS:

=== modified file 'plugins/Unity/Indicators/menucontentactivator.cpp'
--- plugins/Unity/Indicators/menucontentactivator.cpp	2014-08-26 08:14:44 +0000
+++ plugins/Unity/Indicators/menucontentactivator.cpp	2015-05-11 07:50:04 +0000
@@ -28,10 +28,10 @@
         connect(&m_timer, &QTimer::timeout,
                 this, &UnityIndicators::AbstractTimer::timeout);
     }
-    virtual int interval() const { return m_timer.interval(); }
-    virtual void setInterval(int msecs) { m_timer.setInterval(msecs); }
-    virtual void start() { m_timer.start(); UnityIndicators::AbstractTimer::start(); }
-    virtual void stop() { m_timer.stop(); UnityIndicators::AbstractTimer::stop(); }
+    int interval() const override { return m_timer.interval(); }
+    void setInterval(int msecs) override { m_timer.setInterval(msecs); }
+    void start() override { m_timer.start(); UnityIndicators::AbstractTimer::start(); }
+    void stop() override { m_timer.stop(); UnityIndicators::AbstractTimer::stop(); }
 private:
     QTimer m_timer;
 };

=== modified file 'plugins/Unity/Indicators/plugin.h'
--- plugins/Unity/Indicators/plugin.h	2014-10-07 10:28:59 +0000
+++ plugins/Unity/Indicators/plugin.h	2015-05-11 07:50:04 +0000
@@ -27,7 +27,7 @@
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // INDICATORS2_PLUGIN_H

=== modified file 'plugins/Unity/Launcher/launchermodel.h'
--- plugins/Unity/Launcher/launchermodel.h	2015-02-09 17:17:59 +0000
+++ plugins/Unity/Launcher/launchermodel.h	2015-05-11 07:50:04 +0000
@@ -41,19 +41,19 @@
     LauncherModel(QObject *parent = 0);
     ~LauncherModel();
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
-    QVariant data(const QModelIndex &index, int role) const;
-
-    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;
-    Q_INVOKABLE void move(int oldIndex, int newIndex);
-    Q_INVOKABLE void pin(const QString &appId, int index = -1);
-    Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
-    Q_INVOKABLE void setUser(const QString &username);
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+
+    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
+    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
+    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
+    Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex) override;
+    Q_INVOKABLE void setUser(const QString &username) override;
     Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
 
-    unity::shell::application::ApplicationManagerInterface* applicationManager() const;
-    void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
+    unity::shell::application::ApplicationManagerInterface* applicationManager() const override;
+    void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager) override;
 
     bool onlyPinned() const override;
     void setOnlyPinned(bool onlyPinned) override;
@@ -61,7 +61,7 @@
     int findApplication(const QString &appId);
 
 public Q_SLOTS:
-    void requestRemove(const QString &appId);
+    void requestRemove(const QString &appId) override;
     Q_INVOKABLE void refresh();
 
 private:

=== modified file 'plugins/Unity/Launcher/plugin.h'
--- plugins/Unity/Launcher/plugin.h	2013-06-26 14:08:43 +0000
+++ plugins/Unity/Launcher/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Unity/Launcher/quicklistmodel.h'
--- plugins/Unity/Launcher/quicklistmodel.h	2014-08-26 11:34:22 +0000
+++ plugins/Unity/Launcher/quicklistmodel.h	2015-05-11 07:50:04 +0000
@@ -48,8 +48,8 @@
 
     QuickListEntry get(int index) const;
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
 private:
     QList<QuickListEntry> m_list;

=== modified file 'plugins/Unity/Session/plugin.h'
--- plugins/Unity/Session/plugin.h	2014-05-07 15:21:51 +0000
+++ plugins/Unity/Session/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Utils/HomeKeyWatcher.h'
--- plugins/Utils/HomeKeyWatcher.h	2015-04-23 12:49:15 +0000
+++ plugins/Utils/HomeKeyWatcher.h	2015-05-11 07:50:04 +0000
@@ -49,7 +49,7 @@
 
     virtual ~HomeKeyWatcher();
 
-    bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
     void update(QEvent *event);
 

=== modified file 'plugins/Utils/plugin.h'
--- plugins/Utils/plugin.h	2013-10-07 22:32:43 +0000
+++ plugins/Utils/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,8 +28,8 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 };
 
 #endif

=== modified file 'plugins/Utils/qlimitproxymodelqml.h'
--- plugins/Utils/qlimitproxymodelqml.h	2013-08-20 15:13:59 +0000
+++ plugins/Utils/qlimitproxymodelqml.h	2015-05-11 07:50:04 +0000
@@ -32,8 +32,8 @@
 
     /* getters */
     int limit() const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     /* setters */
     void setModel(QAbstractItemModel *model);

=== modified file 'plugins/Utils/qvariantlistmodel.h'
--- plugins/Utils/qvariantlistmodel.h	2013-06-05 22:03:08 +0000
+++ plugins/Utils/qvariantlistmodel.h	2015-05-11 07:50:04 +0000
@@ -54,14 +54,14 @@
 
     ~QVariantListModel();
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex sibling(int row, int column, const QModelIndex &idx) const;
-
-    QVariant data(const QModelIndex &index, int role) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-
-    bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex());
-    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+
+    bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
 
     QVariantList variantList() const;
     void setVariantList(const QVariantList &list);

=== modified file 'plugins/Utils/timeformatter.h'
--- plugins/Utils/timeformatter.h	2014-09-03 12:11:09 +0000
+++ plugins/Utils/timeformatter.h	2015-05-11 07:50:04 +0000
@@ -62,7 +62,7 @@
     GDateTimeFormatter(QObject *parent = 0);
 
 protected:
-    virtual QString formatTime() const;
+    QString formatTime() const override;
 };
 
 #endif

=== modified file 'plugins/Utils/unitysortfilterproxymodelqml.h'
--- plugins/Utils/unitysortfilterproxymodelqml.h	2014-12-19 14:51:35 +0000
+++ plugins/Utils/unitysortfilterproxymodelqml.h	2015-05-11 07:50:04 +0000
@@ -36,12 +36,12 @@
     Q_INVOKABLE int count();
     Q_INVOKABLE int findFirst(int role, const QVariant& value) const;
     Q_INVOKABLE int mapRowToSource(int row);
-    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
 
     /* getters */
     int totalCount() const;
     bool invertMatch() const;
-    QHash<int, QByteArray> roleNames() const;
+    QHash<int, QByteArray> roleNames() const override;
 
     /* setters */
     void setModel(QAbstractItemModel *model);

=== modified file 'plugins/Utils/windowkeysfilter.h'
--- plugins/Utils/windowkeysfilter.h	2014-07-18 10:20:42 +0000
+++ plugins/Utils/windowkeysfilter.h	2015-05-11 07:50:04 +0000
@@ -39,7 +39,7 @@
 public:
     WindowKeysFilter(QQuickItem *parent = 0);
 
-    bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private Q_SLOTS:
     void setupFilterOnWindow(QQuickWindow *window);

=== modified file 'plugins/Wizard/plugin.h'
--- plugins/Wizard/plugin.h	2014-11-24 17:56:44 +0000
+++ plugins/Wizard/plugin.h	2015-05-11 07:50:04 +0000
@@ -26,7 +26,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/AccountsService/plugin.h'
--- tests/mocks/AccountsService/plugin.h	2013-08-27 17:34:46 +0000
+++ tests/mocks/AccountsService/plugin.h	2015-05-11 07:50:04 +0000
@@ -29,7 +29,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/GSettings.1.0/plugin.h'
--- tests/mocks/GSettings.1.0/plugin.h	2013-08-12 13:05:38 +0000
+++ tests/mocks/GSettings.1.0/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // PLUGIN_H

=== modified file 'tests/mocks/LightDM/liblightdm/UsersModel.h'
--- tests/mocks/LightDM/liblightdm/UsersModel.h	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/liblightdm/UsersModel.h	2015-05-11 07:50:04 +0000
@@ -53,8 +53,8 @@
                          BackgroundPathRole
     };
 
-    int rowCount(const QModelIndex &parent) const;
-    QVariant data(const QModelIndex &index, int role) const;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
 
     QString mockMode() const;
     void setMockMode(QString mockMode);

=== modified file 'tests/mocks/LightDM/plugin.h'
--- tests/mocks/LightDM/plugin.h	2015-01-20 11:50:19 +0000
+++ tests/mocks/LightDM/plugin.h	2015-05-11 07:50:04 +0000
@@ -26,7 +26,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/Lights/plugin.h'
--- tests/mocks/Lights/plugin.h	2014-11-24 11:56:32 +0000
+++ tests/mocks/Lights/plugin.h	2015-05-11 07:50:04 +0000
@@ -26,7 +26,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/MeeGo/QOfono/plugin.h'
--- tests/mocks/MeeGo/QOfono/plugin.h	2014-11-21 19:28:16 +0000
+++ tests/mocks/MeeGo/QOfono/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // MOCK_QOFONO_PLUGIN_H

=== modified file 'tests/mocks/Powerd/plugin.h'
--- tests/mocks/Powerd/plugin.h	2013-08-09 14:35:36 +0000
+++ tests/mocks/Powerd/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/QMenuModel/plugin.h'
--- tests/mocks/QMenuModel/plugin.h	2013-09-27 17:50:00 +0000
+++ tests/mocks/QMenuModel/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.h'
--- tests/mocks/QMenuModel/unitymenumodel.h	2014-10-07 10:28:59 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.h	2015-05-11 07:50:04 +0000
@@ -61,12 +61,12 @@
 
     QString nameOwner() const;
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &index) const;
-    QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &index) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     Q_INVOKABLE QObject * submenu(int position, QQmlComponent* actionStateParser = nullptr);
     Q_INVOKABLE bool loadExtendedAttributes(int position, const QVariantMap &schema);

=== modified file 'tests/mocks/QtMultimedia/plugin.h'
--- tests/mocks/QtMultimedia/plugin.h	2013-11-14 11:48:33 +0000
+++ tests/mocks/QtMultimedia/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/Ubuntu/Connectivity/plugin.h'
--- tests/mocks/Ubuntu/Connectivity/plugin.h	2014-09-01 11:24:02 +0000
+++ tests/mocks/Ubuntu/Connectivity/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,8 +28,8 @@
     Q_INTERFACES(QQmlExtensionInterface)
 
 public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 };
 
 #endif // QML_CONNECTIVITY_PLUGIN_H

=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h'
--- tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h	2013-08-05 14:52:55 +0000
+++ tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h	2015-05-11 07:50:04 +0000
@@ -24,7 +24,7 @@
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/Ubuntu/Payments/plugin.h'
--- tests/mocks/Ubuntu/Payments/plugin.h	2014-06-27 20:53:24 +0000
+++ tests/mocks/Ubuntu/Payments/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // PAYMENTS_PLUGIN_H

=== modified file 'tests/mocks/Ubuntu/SystemImage/plugin.h'
--- tests/mocks/Ubuntu/SystemImage/plugin.h	2014-07-30 11:08:29 +0000
+++ tests/mocks/Ubuntu/SystemImage/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // MOCK_SYSTEMIMAGE_PLUGIN_H

=== modified file 'tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h'
--- tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h	2014-11-21 19:28:16 +0000
+++ tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // MOCK_SECURITYPRIVACY_PLUGIN_H

=== modified file 'tests/mocks/Ubuntu/Telephony/MockCallEntry.h'
--- tests/mocks/Ubuntu/Telephony/MockCallEntry.h	2014-09-11 14:53:35 +0000
+++ tests/mocks/Ubuntu/Telephony/MockCallEntry.h	2015-05-11 07:50:04 +0000
@@ -53,7 +53,7 @@
     void elapsedTimerRunningChanged();
 
 protected:
-    void timerEvent(QTimerEvent * event);
+    void timerEvent(QTimerEvent * event) override;
 
 private:
     QString m_phoneNumber;

=== modified file 'tests/mocks/Ubuntu/Telephony/plugin.h'
--- tests/mocks/Ubuntu/Telephony/plugin.h	2014-04-30 18:06:38 +0000
+++ tests/mocks/Ubuntu/Telephony/plugin.h	2015-05-11 07:50:04 +0000
@@ -27,8 +27,8 @@
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
-    void initializeEngine(QQmlEngine *engine, const char *uri);
-    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
+    void registerTypes(const char *uri) override;
 
 private:
     QQmlContext *mRootContext;

=== modified file 'tests/mocks/Unity/Application/ObjectListModel.h'
--- tests/mocks/Unity/Application/ObjectListModel.h	2014-08-29 11:22:48 +0000
+++ tests/mocks/Unity/Application/ObjectListModel.h	2015-05-11 07:50:04 +0000
@@ -76,7 +76,7 @@
         return QVariant();
     }
 
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roleNames;
         roleNames.insert(RoleModelData, "modelData");

=== modified file 'tests/mocks/Unity/Application/plugin.h'
--- tests/mocks/Unity/Application/plugin.h	2014-01-20 11:34:59 +0000
+++ tests/mocks/Unity/Application/plugin.h	2015-05-11 07:50:04 +0000
@@ -24,8 +24,8 @@
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
-    void registerTypes(const char *uri);
-    void initializeEngine(QQmlEngine *engine, const char *uri);
+    void registerTypes(const char *uri) override;
+    void initializeEngine(QQmlEngine *engine, const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/Unity/Connectivity/plugin.h'
--- tests/mocks/Unity/Connectivity/plugin.h	2014-08-15 18:41:51 +0000
+++ tests/mocks/Unity/Connectivity/plugin.h	2015-05-11 07:50:04 +0000
@@ -25,7 +25,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // MOCK_CONNECTIVITY_PLUGIN_H

=== modified file 'tests/mocks/Unity/DashCommunicator/plugin.h'
--- tests/mocks/Unity/DashCommunicator/plugin.h	2014-07-29 11:35:10 +0000
+++ tests/mocks/Unity/DashCommunicator/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/Unity/Indicators/fakeindicatorsmodel.h'
--- tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2014-11-17 23:04:48 +0000
+++ tests/mocks/Unity/Indicators/fakeindicatorsmodel.h	2015-05-11 07:50:04 +0000
@@ -50,11 +50,11 @@
     QVariant modelData() const { return m_modelData; }
 
     /* QAbstractItemModel */
-    QHash<int, QByteArray> roleNames() const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    QModelIndex parent (const QModelIndex &index) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QHash<int, QByteArray> roleNames() const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QModelIndex parent (const QModelIndex &index) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
 Q_SIGNALS:
     void countChanged();

=== modified file 'tests/mocks/Unity/Indicators/fakeplugin.h'
--- tests/mocks/Unity/Indicators/fakeplugin.h	2013-07-01 09:40:30 +0000
+++ tests/mocks/Unity/Indicators/fakeplugin.h	2015-05-11 07:50:04 +0000
@@ -26,7 +26,7 @@
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // INDICATORS_FAKE_PLUGIN_H

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
--- tests/mocks/Unity/Launcher/MockLauncherItem.h	2014-09-02 18:22:37 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-05-11 07:50:04 +0000
@@ -43,9 +43,9 @@
     int progress() const override;
     int count() const override;
     bool countVisible() const override;
-    bool focused() const;
+    bool focused() const override;
 
-    unity::shell::launcher::QuickListModelInterface *quickList() const;
+    unity::shell::launcher::QuickListModelInterface *quickList() const override;
 
 private:
     void setPinned(bool pinned);

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.h'
--- tests/mocks/Unity/Launcher/MockLauncherModel.h	2015-02-09 17:17:59 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.h	2015-05-11 07:50:04 +0000
@@ -34,20 +34,20 @@
     MockLauncherModel(QObject* parent = 0);
     ~MockLauncherModel();
 
-    int rowCount(const QModelIndex& parent) const;
-
-    QVariant data(const QModelIndex& index, int role) const;
-
-    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const;
-    Q_INVOKABLE void move(int oldIndex, int newIndex);
-    Q_INVOKABLE void pin(const QString &appId, int index = -1);
-    Q_INVOKABLE void requestRemove(const QString &appId);
-    Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
-    Q_INVOKABLE void setUser(const QString &username);
+    int rowCount(const QModelIndex& parent) const override;
+
+    QVariant data(const QModelIndex& index, int role) const override;
+
+    Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const override;
+    Q_INVOKABLE void move(int oldIndex, int newIndex) override;
+    Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
+    Q_INVOKABLE void requestRemove(const QString &appId) override;
+    Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex) override;
+    Q_INVOKABLE void setUser(const QString &username) override;
     Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
 
-    unity::shell::application::ApplicationManagerInterface *applicationManager() const;
-    void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
+    unity::shell::application::ApplicationManagerInterface *applicationManager() const override;
+    void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager) override;
 
     bool onlyPinned() const override;
     void setOnlyPinned(bool onlyPinned) override;

=== modified file 'tests/mocks/Unity/Launcher/MockQuickListModel.h'
--- tests/mocks/Unity/Launcher/MockQuickListModel.h	2013-07-05 11:25:54 +0000
+++ tests/mocks/Unity/Launcher/MockQuickListModel.h	2015-05-11 07:50:04 +0000
@@ -30,9 +30,9 @@
 public:
     MockQuickListModel(QObject *parent = 0);
 
-    QVariant data(const QModelIndex &index, int role) const;
+    QVariant data(const QModelIndex &index, int role) const override;
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 };
 
 #endif // MOCKQUICKLISTMODEL_H

=== modified file 'tests/mocks/Unity/Launcher/plugin.h'
--- tests/mocks/Unity/Launcher/plugin.h	2013-07-05 11:25:54 +0000
+++ tests/mocks/Unity/Launcher/plugin.h	2015-05-11 07:50:04 +0000
@@ -29,7 +29,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char* uri);
+    void registerTypes(const char* uri) override;
 };
 
 #endif // TESTLAUNCHER_PLUGIN_H

=== modified file 'tests/mocks/Unity/Notifications/MockActionModel.h'
--- tests/mocks/Unity/Notifications/MockActionModel.h	2015-01-26 12:16:11 +0000
+++ tests/mocks/Unity/Notifications/MockActionModel.h	2015-05-11 07:50:04 +0000
@@ -32,9 +32,9 @@
     ActionModel(QObject *parent=nullptr);
     virtual ~ActionModel();
 
-    virtual int rowCount(const QModelIndex &index) const;
-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex &index) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     Q_ENUMS(ActionsRoles)
     enum ActionsRoles {

=== modified file 'tests/mocks/Unity/Notifications/MockNotificationModel.h'
--- tests/mocks/Unity/Notifications/MockNotificationModel.h	2015-01-26 12:03:19 +0000
+++ tests/mocks/Unity/Notifications/MockNotificationModel.h	2015-05-11 07:50:04 +0000
@@ -35,9 +35,9 @@
     MockNotificationModel(QObject *parent=nullptr);
     virtual ~MockNotificationModel();
 
-    virtual int rowCount(const QModelIndex &parent) const;
-    virtual QVariant data(const QModelIndex &index, int role) const;
-    virtual QHash<int, QByteArray> roleNames() const;
+    int rowCount(const QModelIndex &parent) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     Q_INVOKABLE void append(MockNotification* n);
     MockNotification* getNotification(int id) const;

=== modified file 'tests/mocks/Unity/Notifications/plugin.h'
--- tests/mocks/Unity/Notifications/plugin.h	2015-01-12 15:32:40 +0000
+++ tests/mocks/Unity/Notifications/plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char* uri);
+    void registerTypes(const char* uri) override;
 };
 
 #endif // TESTNOTIFICATION_PLUGIN_H

=== modified file 'tests/mocks/Unity/fake_scopes.h'
--- tests/mocks/Unity/fake_scopes.h	2015-02-12 12:20:49 +0000
+++ tests/mocks/Unity/fake_scopes.h	2015-05-11 07:50:04 +0000
@@ -50,8 +50,8 @@
     Q_INVOKABLE void clearFavorites();
     Q_INVOKABLE void load();
 
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    QModelIndex parent ( const QModelIndex & index ) const;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    QModelIndex parent ( const QModelIndex & index ) const override;
 
     bool loaded() const override;
     int count() const override;

=== modified file 'tests/mocks/Unity/fake_unity_plugin.h'
--- tests/mocks/Unity/fake_unity_plugin.h	2013-06-05 22:03:08 +0000
+++ tests/mocks/Unity/fake_unity_plugin.h	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/mocks/Wizard/mockplugin.h'
--- tests/mocks/Wizard/mockplugin.h	2014-11-14 17:47:00 +0000
+++ tests/mocks/Wizard/mockplugin.h	2015-05-11 07:50:04 +0000
@@ -26,7 +26,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif

=== modified file 'tests/plugins/Dash/horizontaljournaltest.cpp'
--- tests/plugins/Dash/horizontaljournaltest.cpp	2014-05-15 14:50:23 +0000
+++ tests/plugins/Dash/horizontaljournaltest.cpp	2015-05-11 07:50:04 +0000
@@ -32,19 +32,19 @@
 
 class WidthModel : public QAbstractListModel {
 public:
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roles;
         roles.insert(Qt::DisplayRole, "modelWidth");
         return roles;
     }
 
-    int rowCount(const QModelIndex & /*parent*/) const
+    int rowCount(const QModelIndex & /*parent*/) const override
     {
         return m_list.count();
     }
 
-    QVariant data(const QModelIndex &index, int /*role*/) const
+    QVariant data(const QModelIndex &index, int /*role*/) const override
     {
         return m_list[index.row()];
     }

=== modified file 'tests/plugins/Dash/horizontaljournaltry.cpp'
--- tests/plugins/Dash/horizontaljournaltry.cpp	2013-12-19 16:02:38 +0000
+++ tests/plugins/Dash/horizontaljournaltry.cpp	2015-05-11 07:50:04 +0000
@@ -29,7 +29,7 @@
 class QWidthModela : public QStringListModel {
     Q_OBJECT
 public:
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roles;
         roles.insert(Qt::DisplayRole, "modelWidth");

=== modified file 'tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp'
--- tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp	2014-06-05 08:38:51 +0000
+++ tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp	2015-05-11 07:50:04 +0000
@@ -37,7 +37,7 @@
         list << "A" << "B" << "C" << "D" << "E" << "F" << "G" << "H";
     }
 
-    int rowCount(const QModelIndex &parent) const
+    int rowCount(const QModelIndex &parent) const override
     {
         if (parent.isValid())
             return 0;
@@ -45,14 +45,14 @@
             return list.count();
     }
 
-    QVariant data(const QModelIndex &index, int role) const
+    QVariant data(const QModelIndex &index, int role) const override
     {
         if (role == Qt::SizeHintRole) return 50;
         else if (role == Qt::DisplayRole) return list[index.row()];
         return QVariant();
     }
 
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> hash;
         hash.insert(Qt::DisplayRole, "type");

=== modified file 'tests/plugins/Dash/organicgridtest.cpp'
--- tests/plugins/Dash/organicgridtest.cpp	2014-05-22 13:37:05 +0000
+++ tests/plugins/Dash/organicgridtest.cpp	2015-05-11 07:50:04 +0000
@@ -34,12 +34,12 @@
 public:
     DummyModel() : m_count(0) {}
 
-    int rowCount(const QModelIndex & /*parent*/) const
+    int rowCount(const QModelIndex & /*parent*/) const override
     {
         return m_count;
     }
 
-    QVariant data(const QModelIndex & /*index*/, int /*role*/) const
+    QVariant data(const QModelIndex & /*index*/, int /*role*/) const override
     {
         return QVariant();
     }

=== modified file 'tests/plugins/Dash/organicgridtry.cpp'
--- tests/plugins/Dash/organicgridtry.cpp	2014-01-14 12:25:52 +0000
+++ tests/plugins/Dash/organicgridtry.cpp	2015-05-11 07:50:04 +0000
@@ -31,12 +31,12 @@
 public:
     DummyModel() : m_count(0) {}
 
-    int rowCount(const QModelIndex & /*parent*/) const
+    int rowCount(const QModelIndex & /*parent*/) const override
     {
         return m_count;
     }
 
-    QVariant data(const QModelIndex & /*index*/, int /*role*/) const
+    QVariant data(const QModelIndex & /*index*/, int /*role*/) const override
     {
         return QVariant();
     }

=== modified file 'tests/plugins/Dash/verticaljournaltest.cpp'
--- tests/plugins/Dash/verticaljournaltest.cpp	2014-05-15 14:50:23 +0000
+++ tests/plugins/Dash/verticaljournaltest.cpp	2015-05-11 07:50:04 +0000
@@ -32,19 +32,19 @@
 
 class HeightModel : public QAbstractListModel {
 public:
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roles;
         roles.insert(Qt::DisplayRole, "modelHeight");
         return roles;
     }
 
-    int rowCount(const QModelIndex & /*parent*/) const
+    int rowCount(const QModelIndex & /*parent*/) const override
     {
         return m_list.count();
     }
 
-    QVariant data(const QModelIndex &index, int /*role*/) const
+    QVariant data(const QModelIndex &index, int /*role*/) const override
     {
         return m_list[index.row()];
     }

=== modified file 'tests/plugins/Dash/verticaljournaltry.cpp'
--- tests/plugins/Dash/verticaljournaltry.cpp	2013-12-17 16:35:44 +0000
+++ tests/plugins/Dash/verticaljournaltry.cpp	2015-05-11 07:50:04 +0000
@@ -29,7 +29,7 @@
 class QHeightModel : public QStringListModel {
     Q_OBJECT
 public:
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roles;
         roles.insert(Qt::DisplayRole, "modelHeight");

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp	2013-10-22 15:56:37 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp	2015-05-11 07:50:04 +0000
@@ -24,7 +24,7 @@
 public:
     FakeTimeSource() : m_value(0) {}
 
-    virtual qint64 msecsSinceReference() {
+    qint64 msecsSinceReference() override {
         return m_value;
     }
 

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2015-04-10 21:16:37 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2015-05-11 07:50:04 +0000
@@ -84,7 +84,7 @@
 public:
     tst_DirectionalDragArea();
 private Q_SLOTS:
-    void init(); // called right before each and every test function is executed
+    void init() override; // called right before each and every test function is executed
 
     void dragWithShortDirectionChange();
     void recognitionTimerUsage();

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp	2013-11-22 13:43:40 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.cpp	2015-05-11 07:50:04 +0000
@@ -28,7 +28,7 @@
 public:
     tst_PressedOutsideNotifier();
 private Q_SLOTS:
-    void init(); // called right before each and every test function is executed
+    void init() override; // called right before each and every test function is executed
 
     void touchOutsideAreaTriggersSignal();
     void touchInsideAreaHasNoEffect();

=== modified file 'tests/plugins/Unity/Indicators/menucontentactivatortest.cpp'
--- tests/plugins/Unity/Indicators/menucontentactivatortest.cpp	2013-12-12 12:25:20 +0000
+++ tests/plugins/Unity/Indicators/menucontentactivatortest.cpp	2015-05-11 07:50:04 +0000
@@ -30,8 +30,8 @@
         : UnityIndicators::AbstractTimer(parent)
     {}
 
-    virtual int interval() const { return m_duration; }
-    virtual void setInterval(int msecs) { m_duration = msecs; }
+    int interval() const override { return m_duration; }
+    void setInterval(int msecs) override { m_duration = msecs; }
 
     void emitTimeout() {
         if (isRunning()) {

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-03-30 17:36:42 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-05-11 07:50:04 +0000
@@ -39,13 +39,13 @@
     Q_OBJECT
 public:
     MockApp(const QString &appId, QObject *parent = 0): ApplicationInfoInterface(appId, parent), m_appId(appId), m_focused(false) { }
-    QString appId() const { return m_appId; }
-    QString name() const { return "mock"; }
-    QString comment() const { return "this is a mock"; }
-    QUrl icon() const { return QUrl(); }
-    ApplicationInfoInterface::Stage stage() const { return ApplicationInfoInterface::MainStage; }
-    ApplicationInfoInterface::State state() const { return ApplicationInfoInterface::Running; }
-    bool focused() const { return m_focused; }
+    QString appId() const override { return m_appId; }
+    QString name() const override { return "mock"; }
+    QString comment() const override { return "this is a mock"; }
+    QUrl icon() const override { return QUrl(); }
+    ApplicationInfoInterface::Stage stage() const override { return ApplicationInfoInterface::MainStage; }
+    ApplicationInfoInterface::State state() const override { return ApplicationInfoInterface::Running; }
+    bool focused() const override { return m_focused; }
     QString splashTitle() const override { return QString(); }
     QUrl splashImage() const override { return QUrl(); }
     bool splashShowHeader() const override { return true; }
@@ -66,16 +66,16 @@
     Q_OBJECT
 public:
     MockAppManager(QObject *parent = 0): ApplicationManagerInterface(parent) {}
-    int rowCount(const QModelIndex &) const { return m_list.count(); }
-    QVariant data(const QModelIndex &, int ) const { return QVariant(); }
-    QString focusedApplicationId() const {
+    int rowCount(const QModelIndex &) const override { return m_list.count(); }
+    QVariant data(const QModelIndex &, int ) const override { return QVariant(); }
+    QString focusedApplicationId() const override {
         Q_FOREACH(MockApp *app, m_list) {
             if (app->focused()) return app->appId();
         }
         return QString();
     }
-    unity::shell::application::ApplicationInfoInterface *get(int index) const { return m_list.at(index); }
-    unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const {
+    unity::shell::application::ApplicationInfoInterface *get(int index) const override { return m_list.at(index); }
+    unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const override {
         Q_FOREACH(MockApp* app, m_list) {
             if (app->appId() == appId) {
                 return app;
@@ -83,8 +83,8 @@
         }
         return nullptr;
     }
-    unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) { return nullptr; }
-    bool stopApplication(const QString &appId) {
+    unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) override { return nullptr; }
+    bool stopApplication(const QString &appId) override {
         Q_FOREACH(MockApp* app, m_list) {
             if (app->appId() == appId) {
                 removeApplication(m_list.indexOf(app));
@@ -93,7 +93,7 @@
         }
         return false;
     }
-    bool focusApplication(const QString &appId) {
+    bool focusApplication(const QString &appId) override {
         Q_FOREACH(MockApp* app, m_list) {
             app->setFocused(app->appId() == appId);
         }
@@ -101,7 +101,7 @@
         return true;
     }
 
-    void unfocusCurrentApplication() { }
+    void unfocusCurrentApplication() override { }
 
     void addApplication(MockApp *app) {
         beginInsertRows(QModelIndex(), count(), count());
@@ -113,11 +113,11 @@
         m_list.takeAt(index)->deleteLater();
         endRemoveRows();
     }
-    bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
-    bool suspended() const { return false; }
-    void setSuspended(bool) {}
-    bool forceDashActive() const { return false; }
-    void setForceDashActive(bool) {}
+    bool requestFocusApplication(const QString &appId) override { Q_UNUSED(appId); return true; }
+    bool suspended() const override { return false; }
+    void setSuspended(bool) override {}
+    bool forceDashActive() const override { return false; }
+    void setForceDashActive(bool) override {}
 
 private:
     QList<MockApp*> m_list;

=== modified file 'tests/plugins/Utils/qlimitproxymodeltest.cpp'
--- tests/plugins/Utils/qlimitproxymodeltest.cpp	2013-08-20 15:13:59 +0000
+++ tests/plugins/Utils/qlimitproxymodeltest.cpp	2015-05-11 07:50:04 +0000
@@ -36,12 +36,12 @@
     {
     }
 
-    int rowCount(const QModelIndex& /* parent */ = QModelIndex()) const
+    int rowCount(const QModelIndex& /* parent */ = QModelIndex()) const override
     {
         return m_list.size();
     }
 
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
     {
         if (!index.isValid() || index.row() < 0 || index.row() >= m_list.size() || role != Qt::DisplayRole) {
            return QVariant();
@@ -49,7 +49,7 @@
         return QVariant(m_list[index.row()]);
     }
 
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         return m_roles;
     }
@@ -65,7 +65,7 @@
         endRemoveRows();
     }
 
-    bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+    bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex()) override {
         beginInsertRows(parent, row, row+count-1);
         for (int i=0; i<count; i++) {
             m_list.insert(i+row, QString::number(i));
@@ -81,7 +81,7 @@
         return true;
     }
 
-    bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+    bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex()) override {
         beginRemoveRows(parent, row, row+count-1);
         for (int i=0; i<count; i++) {
             m_list.removeAt(row);

=== modified file 'tests/plugins/Utils/unitysortfilterproxymodeltest.cpp'
--- tests/plugins/Utils/unitysortfilterproxymodeltest.cpp	2014-12-19 14:51:35 +0000
+++ tests/plugins/Utils/unitysortfilterproxymodeltest.cpp	2015-05-11 07:50:04 +0000
@@ -39,12 +39,12 @@
     {
     }
 
-    int rowCount(const QModelIndex& /* parent */ = QModelIndex()) const
+    int rowCount(const QModelIndex& /* parent */ = QModelIndex()) const override
     {
         return m_list.size();
     }
 
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override
     {
         if (!index.isValid() || index.row() < 0 || index.row() >= m_list.size() || role != Qt::DisplayRole) {
            return QVariant();
@@ -52,7 +52,7 @@
         return QVariant(m_list[index.row()]);
     }
 
-    QHash<int, QByteArray> roleNames() const
+    QHash<int, QByteArray> roleNames() const override
     {
         return m_roles;
     }
@@ -61,7 +61,7 @@
         m_roles = roles;
     }
 
-    bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+    bool insertRows(int row, int count, const QModelIndex &parent=QModelIndex()) override {
         beginInsertRows(parent, row, row+count-1);
         for (int i=0; i<count; i++) {
             m_list.insert(i+row, QString("test%1").arg(i));
@@ -77,7 +77,7 @@
         return true;
     }
 
-    bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex()) {
+    bool removeRows(int row, int count, const QModelIndex &parent=QModelIndex()) override {
         beginRemoveRows(parent, row, row+count-1);
         for (int i=0; i<count; i++) {
             m_list.removeAt(row);

=== modified file 'tests/utils/modules/Unity/Test/plugin.h'
--- tests/utils/modules/Unity/Test/plugin.h	2013-06-05 22:03:08 +0000
+++ tests/utils/modules/Unity/Test/plugin.h	2015-05-11 07:50:04 +0000
@@ -26,7 +26,7 @@
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 #endif // UNITY_TEST_PLUGIN_H