Ubuntu UI Toolkit

Merge lp:~aacid/ubuntu-ui-toolkit/add_override into lp:ubuntu-ui-toolkit/staging

  1. add_override
  2. Merge into staging
Proposed by Albert Astals Cid
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1965
Merged at revision: 1982
Proposed branch: lp:~aacid/ubuntu-ui-toolkit/add_override
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 1179 lines (+202/-193)
57 files modified
.qmake.conf (+7/-0)
src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+27/-27)
src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h (+4/-4)
src/Ubuntu/Components/plugin/inversemouseareatype.h (+6/-6)
src/Ubuntu/Components/plugin/plugin.h (+2/-2)
src/Ubuntu/Components/plugin/privates/appheaderbase.h (+2/-2)
src/Ubuntu/Components/plugin/privates/frame.cpp (+4/-4)
src/Ubuntu/Components/plugin/privates/frame.h (+4/-4)
src/Ubuntu/Components/plugin/privates/listitemdragarea.h (+4/-4)
src/Ubuntu/Components/plugin/privates/ucpagewrapper.h (+1/-1)
src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h (+2/-2)
src/Ubuntu/Components/plugin/quickutils.h (+1/-1)
src/Ubuntu/Components/plugin/sortfiltermodel.h (+2/-2)
src/Ubuntu/Components/plugin/ucabstractbutton.h (+5/-5)
src/Ubuntu/Components/plugin/ucaction.h (+1/-1)
src/Ubuntu/Components/plugin/ucactioncontext.h (+2/-2)
src/Ubuntu/Components/plugin/ucactionmanager.h (+2/-2)
src/Ubuntu/Components/plugin/ucalarmmodel.h (+7/-7)
src/Ubuntu/Components/plugin/ucarguments.h (+2/-2)
src/Ubuntu/Components/plugin/ucbottomedge.h (+2/-2)
src/Ubuntu/Components/plugin/ucbottomedge_p.h (+2/-2)
src/Ubuntu/Components/plugin/ucbottomedgehint.h (+6/-6)
src/Ubuntu/Components/plugin/ucbottomedgestyle.h (+1/-1)
src/Ubuntu/Components/plugin/ucheader.h (+1/-1)
src/Ubuntu/Components/plugin/ucinversemouse.h (+6/-6)
src/Ubuntu/Components/plugin/uclabel.h (+3/-3)
src/Ubuntu/Components/plugin/uclistitem.h (+12/-12)
src/Ubuntu/Components/plugin/uclistitem_p.h (+2/-2)
src/Ubuntu/Components/plugin/uclistitemstyle.h (+2/-2)
src/Ubuntu/Components/plugin/ucmainviewbase.h (+2/-2)
src/Ubuntu/Components/plugin/ucmouse.h (+2/-2)
src/Ubuntu/Components/plugin/ucpagetreenode.h (+2/-2)
src/Ubuntu/Components/plugin/ucproportionalshape.h (+1/-1)
src/Ubuntu/Components/plugin/ucscalingimageprovider.h (+1/-1)
src/Ubuntu/Components/plugin/ucserviceproperties.h (+2/-2)
src/Ubuntu/Components/plugin/ucslotslayout.h (+2/-2)
src/Ubuntu/Components/plugin/ucstyleditembase.h (+8/-8)
src/Ubuntu/Components/plugin/ucstyleditembase_p.h (+1/-1)
src/Ubuntu/Components/plugin/ucstylehints.h (+4/-4)
src/Ubuntu/Components/plugin/uctheme.h (+2/-2)
src/Ubuntu/Components/plugin/ucthemingextension.cpp (+1/-1)
src/Ubuntu/Components/plugin/ucubuntushape.h (+12/-12)
src/Ubuntu/Components/plugin/ucubuntushapeoverlay.h (+7/-7)
src/Ubuntu/Components/plugin/unitythemeiconprovider.h (+1/-1)
src/Ubuntu/Layouts/plugin/propertychanges_p.h (+9/-9)
src/Ubuntu/Layouts/plugin/ullayouts.h (+2/-2)
src/Ubuntu/Layouts/plugin/ullayouts_p.h (+2/-2)
src/Ubuntu/Layouts/plugin/ulplugin.h (+1/-1)
src/Ubuntu/PerformanceMetrics/plugin/upmcpuusage.h (+1/-1)
src/Ubuntu/PerformanceMetrics/plugin/upmplugin.h (+2/-2)
src/Ubuntu/PerformanceMetrics/plugin/upmrenderingtimes.h (+1/-1)
src/Ubuntu/PerformanceMetrics/plugin/upmtexturefromimage.h (+4/-4)
src/Ubuntu/Test/plugin/testplugin.h (+1/-1)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h (+2/-2)
tests/api/Extinct/Animals/plugin/plugin.h (+2/-2)
tests/unit_x11/tst_components/tabsmodel.h (+3/-3)
tests/unit_x11/tst_components/tst_components.pro (+2/-0)
To merge this branch: bzr merge lp:~aacid/ubuntu-ui-toolkit/add_override
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+293244@code.launchpad.net

Commit message

Add override

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/776/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3062/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/776/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/557/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3063/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/557/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/745/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3064/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/745/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/531/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3065/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/531/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1961
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/358/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/745
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/745/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/776
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/557
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/531
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3066/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3064
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3062
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3063
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3065

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/358/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/823/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3284/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/823/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/578/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3285/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/578/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/792/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3286/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/792/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/604/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3287/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/604/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1964
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/391/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/792/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/823/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/604
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/578/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3288/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3286
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3284
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3287
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3285

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/391/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/824/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3289/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/824/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/605/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3290/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/605/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/579/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3291/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/579/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/793/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3292/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/793/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/392/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/793
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/793/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/824
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/605
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/579
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3293/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3292
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3289
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3290
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3291

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/392/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Thanks for it!

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/827/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3303/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/827/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/582/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3304/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/582/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/608/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3305/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/608/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/796/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3306/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/796/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/297/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/796
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/796/artifact/artifacts/*zip*/artifacts.zip
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/827/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/608
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/582/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/304/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3306
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3303
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3305
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3304

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/841/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3366/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/841/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/622/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3367/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/622/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/596/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3368/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/596/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:1965
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/810/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3369/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/810/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 '.qmake.conf'
2--- .qmake.conf 2015-08-13 09:20:05 +0000
3+++ .qmake.conf 2016-05-13 09:11:41 +0000
4@@ -16,3 +16,10 @@
5 exists($$PWD/../qt.pro) {
6 CONFIG += build_with_qt
7 }
8+
9+*-g++* {
10+ GCC4 = $$system( gcc -dumpversion | grep "^4.[0-9]" )
11+ if (isEmpty(GCC4)) {
12+ QMAKE_CXXFLAGS += -Wsuggest-override
13+ }
14+}
15
16=== modified file 'src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
17--- src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h 2015-03-24 16:51:39 +0000
18+++ src/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h 2016-05-13 09:11:41 +0000
19@@ -37,28 +37,28 @@
20 AlarmDataAdapter(UCAlarm *qq);
21 ~AlarmDataAdapter();
22
23- bool enabled() const;
24- bool setEnabled(bool enabled);
25- QDateTime date() const;
26- bool setDate(const QDateTime &date);
27- QString message() const;
28- bool setMessage(const QString &message);
29- UCAlarm::AlarmType type() const;
30- bool setType(UCAlarm::AlarmType type);
31- UCAlarm::DaysOfWeek daysOfWeek() const;
32- bool setDaysOfWeek(UCAlarm::DaysOfWeek days);
33- QUrl sound() const;
34- bool setSound(const QUrl &sound);
35- QVariant cookie() const;
36- UCAlarm::Error checkAlarm();
37+ bool enabled() const override;
38+ bool setEnabled(bool enabled) override;
39+ QDateTime date() const override;
40+ bool setDate(const QDateTime &date) override;
41+ QString message() const override;
42+ bool setMessage(const QString &message) override;
43+ UCAlarm::AlarmType type() const override;
44+ bool setType(UCAlarm::AlarmType type) override;
45+ UCAlarm::DaysOfWeek daysOfWeek() const override;
46+ bool setDaysOfWeek(UCAlarm::DaysOfWeek days) override;
47+ QUrl sound() const override;
48+ bool setSound(const QUrl &sound) override;
49+ QVariant cookie() const override;
50+ UCAlarm::Error checkAlarm() override;
51
52- void save();
53- void cancel();
54- void reset();
55+ void save() override;
56+ void cancel() override;
57+ void reset() override;
58 bool wait(int msec);
59- void completeSave();
60- void completeCancel();
61- void copyAlarmData(const UCAlarm &other);
62+ void completeSave() override;
63+ void completeCancel() override;
64+ void copyAlarmData(const UCAlarm &other) override;
65
66 // adaptation specific data
67 void adjustDowSettings(UCAlarm::AlarmType type, UCAlarm::DaysOfWeek days);
68@@ -179,17 +179,17 @@
69 QOrganizerManager *manager;
70 QOrganizerCollection collection;
71
72- void init();
73- int alarmCount();
74- UCAlarm *getAlarmAt(int index) const;
75- bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const;
76+ void init() override;
77+ int alarmCount() override;
78+ UCAlarm *getAlarmAt(int index) const override;
79+ bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const override;
80 void adjustAlarmOccurrence(AlarmDataAdapter &alarm);
81
82 void loadAlarms();
83 void saveAlarms();
84
85- bool verifyChange(UCAlarm *alarm, AlarmManager::Change change, const QVariant &value);
86- UCAlarmPrivate *createAlarmData(UCAlarm *alarm);
87+ bool verifyChange(UCAlarm *alarm, AlarmManager::Change change, const QVariant &value) override;
88+ UCAlarmPrivate *createAlarmData(UCAlarm *alarm) override;
89
90 void insertAlarm(const QOrganizerItemId &id);
91 void updateAlarm(const QOrganizerItemId &id);
92@@ -197,7 +197,7 @@
93
94 private Q_SLOTS:
95 void completeFetchAlarms();
96- bool fetchAlarms();
97+ bool fetchAlarms() override;
98 void alarmOperation(QList<QPair<QOrganizerItemId,QOrganizerManager::Operation> >);
99
100 protected:
101
102=== modified file 'src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h'
103--- src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h 2014-11-26 15:39:39 +0000
104+++ src/Ubuntu/Components/plugin/adapters/dbuspropertywatcher_p.h 2016-05-13 09:11:41 +0000
105@@ -32,11 +32,11 @@
106 public:
107 DBusServiceProperties(UCServiceProperties *qq);
108
109- bool init();
110- bool fetchPropertyValues();
111- bool readProperty(const QString &property);
112+ bool init() override;
113+ bool fetchPropertyValues() override;
114+ bool readProperty(const QString &property) override;
115 // for testing purposes only!!!
116- bool testProperty(const QString &property, const QVariant &value);
117+ bool testProperty(const QString &property, const QVariant &value) override;
118
119 QStringList scannedProperties;
120 QDBusConnection connection;
121
122=== modified file 'src/Ubuntu/Components/plugin/inversemouseareatype.h'
123--- src/Ubuntu/Components/plugin/inversemouseareatype.h 2014-06-18 15:24:42 +0000
124+++ src/Ubuntu/Components/plugin/inversemouseareatype.h 2016-05-13 09:11:41 +0000
125@@ -29,16 +29,16 @@
126 explicit InverseMouseAreaType(QQuickItem *parent = 0);
127 ~InverseMouseAreaType();
128
129- Q_INVOKABLE virtual bool contains(const QPointF &point) const;
130+ Q_INVOKABLE bool contains(const QPointF &point) const override;
131
132 protected:
133- void itemChange(ItemChange, const ItemChangeData &);
134- void componentComplete();
135- bool eventFilter(QObject *, QEvent *);
136+ void itemChange(ItemChange, const ItemChangeData &) override;
137+ void componentComplete() override;
138+ bool eventFilter(QObject *, QEvent *) override;
139
140 // override mouse events
141- void mousePressEvent(QMouseEvent *event);
142- void mouseDoubleClickEvent(QMouseEvent *event);
143+ void mousePressEvent(QMouseEvent *event) override;
144+ void mouseDoubleClickEvent(QMouseEvent *event) override;
145
146
147 private: // getter/setter
148
149=== modified file 'src/Ubuntu/Components/plugin/plugin.h'
150--- src/Ubuntu/Components/plugin/plugin.h 2016-04-20 15:00:27 +0000
151+++ src/Ubuntu/Components/plugin/plugin.h 2016-05-13 09:11:41 +0000
152@@ -30,8 +30,8 @@
153 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
154
155 public:
156- void registerTypes(const char *uri);
157- void initializeEngine(QQmlEngine *engine, const char *uri);
158+ void registerTypes(const char *uri) override;
159+ void initializeEngine(QQmlEngine *engine, const char *uri) override;
160 static const QUrl &pluginUrl()
161 {
162 return m_baseUrl;
163
164=== modified file 'src/Ubuntu/Components/plugin/privates/appheaderbase.h'
165--- src/Ubuntu/Components/plugin/privates/appheaderbase.h 2016-02-01 21:22:01 +0000
166+++ src/Ubuntu/Components/plugin/privates/appheaderbase.h 2016-05-13 09:11:41 +0000
167@@ -44,8 +44,8 @@
168 void themeChanged2();
169
170 protected:
171- virtual void show(bool animate);
172- virtual void hide(bool animate);
173+ void show(bool animate) override;
174+ void hide(bool animate) override;
175
176 private:
177 bool m_animate:1;
178
179=== modified file 'src/Ubuntu/Components/plugin/privates/frame.cpp'
180--- src/Ubuntu/Components/plugin/privates/frame.cpp 2016-01-21 11:46:11 +0000
181+++ src/Ubuntu/Components/plugin/privates/frame.cpp 2016-05-13 09:11:41 +0000
182@@ -31,10 +31,10 @@
183 {
184 public:
185 FrameShader();
186- virtual char const* const* attributeNames() const;
187- virtual void initialize();
188- virtual void updateState(
189- const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect);
190+ char const* const* attributeNames() const override;
191+ void initialize() override;
192+ void updateState(
193+ const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect) override;
194
195 private:
196 int m_matrixId;
197
198=== modified file 'src/Ubuntu/Components/plugin/privates/frame.h'
199--- src/Ubuntu/Components/plugin/privates/frame.h 2016-01-21 11:31:06 +0000
200+++ src/Ubuntu/Components/plugin/privates/frame.h 2016-05-13 09:11:41 +0000
201@@ -27,9 +27,9 @@
202 {
203 public:
204 UCFrameMaterial();
205- virtual QSGMaterialType* type() const;
206- virtual QSGMaterialShader* createShader() const;
207- virtual int compare(const QSGMaterial* other) const;
208+ QSGMaterialType* type() const override;
209+ QSGMaterialShader* createShader() const override;
210+ int compare(const QSGMaterial* other) const override;
211
212 quint32 textureId() const { return m_textureId; }
213
214@@ -87,7 +87,7 @@
215 void colorChanged();
216
217 private:
218- virtual QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data);
219+ QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) override;
220
221 QRgb m_color;
222 float m_thickness;
223
224=== modified file 'src/Ubuntu/Components/plugin/privates/listitemdragarea.h'
225--- src/Ubuntu/Components/plugin/privates/listitemdragarea.h 2015-08-31 15:43:14 +0000
226+++ src/Ubuntu/Components/plugin/privates/listitemdragarea.h 2016-05-13 09:11:41 +0000
227@@ -31,10 +31,10 @@
228 void reset();
229
230 protected:
231- void timerEvent(QTimerEvent *event);
232- void mousePressEvent(QMouseEvent *event);
233- void mouseReleaseEvent(QMouseEvent *event);
234- void mouseMoveEvent(QMouseEvent *event);
235+ void timerEvent(QTimerEvent *event) override;
236+ void mousePressEvent(QMouseEvent *event) override;
237+ void mouseReleaseEvent(QMouseEvent *event) override;
238+ void mouseMoveEvent(QMouseEvent *event) override;
239
240 private:
241 QBasicTimer scrollTimer;
242
243=== modified file 'src/Ubuntu/Components/plugin/privates/ucpagewrapper.h'
244--- src/Ubuntu/Components/plugin/privates/ucpagewrapper.h 2016-02-08 10:25:31 +0000
245+++ src/Ubuntu/Components/plugin/privates/ucpagewrapper.h 2016-05-13 09:11:41 +0000
246@@ -77,7 +77,7 @@
247 Q_INVOKABLE void destroyObject ();
248
249 // QQuickItem interface
250- virtual void itemChange(ItemChange change, const ItemChangeData &data) override;
251+ void itemChange(ItemChange change, const ItemChangeData &data) override;
252
253 //override QQuickItem properties
254 void setVisible2(bool visible);
255
256=== modified file 'src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h'
257--- src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h 2016-02-18 19:18:13 +0000
258+++ src/Ubuntu/Components/plugin/privates/ucpagewrapperincubator_p.h 2016-05-13 09:11:41 +0000
259@@ -36,7 +36,7 @@
260 ~UCPageWrapperIncubator();
261
262 // QQmlIncubator interface
263- virtual void statusChanged(Status status) override;
264+ void statusChanged(Status status) override;
265 Q_INVOKABLE void forceCompletion();
266
267 QJSValue onStatusChanged() const;
268@@ -44,7 +44,7 @@
269
270 protected:
271 // QQmlIncubator interface
272- virtual void setInitialState(QObject *target) override;
273+ void setInitialState(QObject *target) override;
274
275
276 Q_SIGNALS:
277
278=== modified file 'src/Ubuntu/Components/plugin/quickutils.h'
279--- src/Ubuntu/Components/plugin/quickutils.h 2016-02-25 19:42:11 +0000
280+++ src/Ubuntu/Components/plugin/quickutils.h 2016-05-13 09:11:41 +0000
281@@ -77,7 +77,7 @@
282 void keyboardAttachedChanged();
283
284 protected:
285- bool eventFilter(QObject *, QEvent *);
286+ bool eventFilter(QObject *, QEvent *) override;
287
288 private:
289 explicit QuickUtils(QObject *parent = 0);
290
291=== modified file 'src/Ubuntu/Components/plugin/sortfiltermodel.h'
292--- src/Ubuntu/Components/plugin/sortfiltermodel.h 2014-05-22 15:57:23 +0000
293+++ src/Ubuntu/Components/plugin/sortfiltermodel.h 2016-05-13 09:11:41 +0000
294@@ -40,10 +40,10 @@
295 Q_INVOKABLE QVariantMap get(int row);
296 QVariant data(int row, int role);
297 Q_INVOKABLE int count();
298- virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
299+ bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
300
301 /* getters */
302- QHash<int, QByteArray> roleNames() const;
303+ QHash<int, QByteArray> roleNames() const override;
304
305 /* setters */
306 void setFilterProperty(const QString& property);
307
308=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
309--- src/Ubuntu/Components/plugin/ucabstractbutton.h 2016-04-14 22:03:13 +0000
310+++ src/Ubuntu/Components/plugin/ucabstractbutton.h 2016-05-13 09:11:41 +0000
311@@ -51,11 +51,11 @@
312 bool contains(const QPointF &point) const override;
313
314 protected:
315- void classBegin();
316- virtual void geometryChanged(const QRectF &newGeometry,
317- const QRectF &oldGeometry);
318- void keyReleaseEvent(QKeyEvent *key);
319- void touchEvent(QTouchEvent *event);
320+ void classBegin() override;
321+ void geometryChanged(const QRectF &newGeometry,
322+ const QRectF &oldGeometry) override;
323+ void keyReleaseEvent(QKeyEvent *key) override;
324+ void touchEvent(QTouchEvent *event) override;
325
326 Q_SIGNALS:
327 void pressedChanged();
328
329=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
330--- src/Ubuntu/Components/plugin/ucaction.h 2015-12-21 17:49:59 +0000
331+++ src/Ubuntu/Components/plugin/ucaction.h 2016-05-13 09:11:41 +0000
332@@ -153,7 +153,7 @@
333 bool isValidType(QVariant::Type valueType);
334 void generateName();
335 void setMnemonicFromText(const QString &text);
336- bool event(QEvent *event);
337+ bool event(QEvent *event) override;
338 void onKeyboardAttached();
339 };
340 QML_DECLARE_TYPE(UCAction)
341
342=== modified file 'src/Ubuntu/Components/plugin/ucactioncontext.h'
343--- src/Ubuntu/Components/plugin/ucactioncontext.h 2015-12-25 10:59:23 +0000
344+++ src/Ubuntu/Components/plugin/ucactioncontext.h 2016-05-13 09:11:41 +0000
345@@ -38,8 +38,8 @@
346
347 static UCActionContextAttached *qmlAttachedProperties(QObject *owner);
348
349- void classBegin();
350- void componentComplete();
351+ void classBegin() override;
352+ void componentComplete() override;
353 void markActionsPublished(bool mark);
354 bool isPopup() const
355 {
356
357=== modified file 'src/Ubuntu/Components/plugin/ucactionmanager.h'
358--- src/Ubuntu/Components/plugin/ucactionmanager.h 2015-07-09 17:55:03 +0000
359+++ src/Ubuntu/Components/plugin/ucactionmanager.h 2016-05-13 09:11:41 +0000
360@@ -34,8 +34,8 @@
361 public:
362 explicit UCActionManager(QObject *parent = 0);
363
364- void classBegin() {}
365- void componentComplete();
366+ void classBegin() override {}
367+ void componentComplete() override;
368
369 QQmlListProperty<UCAction> actions();
370 QQmlListProperty<UCActionContext> localContexts();
371
372=== modified file 'src/Ubuntu/Components/plugin/ucalarmmodel.h'
373--- src/Ubuntu/Components/plugin/ucalarmmodel.h 2015-06-16 11:34:02 +0000
374+++ src/Ubuntu/Components/plugin/ucalarmmodel.h 2016-05-13 09:11:41 +0000
375@@ -33,13 +33,13 @@
376 explicit UCAlarmModel(QObject *parent = 0);
377 ~UCAlarmModel();
378
379- void classBegin();
380- void componentComplete();
381-
382- int rowCount(const QModelIndex &parent) const;
383- QVariant data(const QModelIndex &index, int role) const;
384-
385- QHash<int, QByteArray> roleNames() const;
386+ void classBegin() override;
387+ void componentComplete() override;
388+
389+ int rowCount(const QModelIndex &parent) const override;
390+ QVariant data(const QModelIndex &index, int role) const override;
391+
392+ QHash<int, QByteArray> roleNames() const override;
393
394 // invokables
395 Q_INVOKABLE UCAlarm *get(int index);
396
397=== modified file 'src/Ubuntu/Components/plugin/ucarguments.h'
398--- src/Ubuntu/Components/plugin/ucarguments.h 2013-10-18 08:56:39 +0000
399+++ src/Ubuntu/Components/plugin/ucarguments.h 2016-05-13 09:11:41 +0000
400@@ -52,8 +52,8 @@
401 Q_INVOKABLE void quitWithError(const QString& errorMessage = QString());
402
403 // inherited from QQmlParserStatus
404- void classBegin();
405- void componentComplete();
406+ void classBegin() override;
407+ void componentComplete() override;
408
409 // methods necessary for implementing property QQmlListProperty arguments
410 void appendArguments(UCArgument* argument);
411
412=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.h'
413--- src/Ubuntu/Components/plugin/ucbottomedge.h 2016-02-20 15:11:02 +0000
414+++ src/Ubuntu/Components/plugin/ucbottomedge.h 2016-05-13 09:11:41 +0000
415@@ -104,8 +104,8 @@
416 static void regions_clear(QQmlListProperty<UCBottomEdgeRegion> *sections);
417
418 void initializeComponent();
419- void classBegin();
420- void itemChange(ItemChange change, const ItemChangeData &data);
421+ void classBegin() override;
422+ void itemChange(ItemChange change, const ItemChangeData &data) override;
423 bool eventFilter(QObject *target, QEvent *event) override;
424
425 void unlockOperation(bool running);
426
427=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge_p.h'
428--- src/Ubuntu/Components/plugin/ucbottomedge_p.h 2016-02-20 15:11:02 +0000
429+++ src/Ubuntu/Components/plugin/ucbottomedge_p.h 2016-05-13 09:11:41 +0000
430@@ -70,8 +70,8 @@
431 // from UCStyledItemBase
432 bool loadStyleItem(bool animated = true) override;
433 // from QQuickItemChangeListener
434- void itemChildAdded(QQuickItem *item, QQuickItem *child);
435- void itemChildRemoved(QQuickItem *item, QQuickItem *child);
436+ void itemChildAdded(QQuickItem *item, QQuickItem *child) override;
437+ void itemChildRemoved(QQuickItem *item, QQuickItem *child) override;
438
439 void setCurrentContent();
440 void resetCurrentContent(QQuickItem *newItem);
441
442=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.h'
443--- src/Ubuntu/Components/plugin/ucbottomedgehint.h 2015-12-11 11:04:54 +0000
444+++ src/Ubuntu/Components/plugin/ucbottomedgehint.h 2016-05-13 09:11:41 +0000
445@@ -70,12 +70,12 @@
446 void stateChanged();
447 protected:
448 UCBottomEdgeHint(UCBottomEdgeHintPrivate &&, QQuickItem *parent);
449- void classBegin();
450- void itemChange(ItemChange change, const ItemChangeData &data);
451- void timerEvent(QTimerEvent *event);
452- void keyPressEvent(QKeyEvent *event);
453- void mousePressEvent(QMouseEvent *event);
454- void mouseReleaseEvent(QMouseEvent *event);
455+ void classBegin() override;
456+ void itemChange(ItemChange change, const ItemChangeData &data) override;
457+ void timerEvent(QTimerEvent *event) override;
458+ void keyPressEvent(QKeyEvent *event) override;
459+ void mousePressEvent(QMouseEvent *event) override;
460+ void mouseReleaseEvent(QMouseEvent *event) override;
461
462 void handleFlickableActivation();
463 void onDraggingChanged(bool dragging);
464
465=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgestyle.h'
466--- src/Ubuntu/Components/plugin/ucbottomedgestyle.h 2015-11-20 10:32:07 +0000
467+++ src/Ubuntu/Components/plugin/ucbottomedgestyle.h 2016-05-13 09:11:41 +0000
468@@ -45,7 +45,7 @@
469 void revealThresholdChanged();
470
471 protected:
472- void mousePressEvent(QMouseEvent *event);
473+ void mousePressEvent(QMouseEvent *event) override;
474
475 private:
476 QQuickItem *m_panel = nullptr;
477
478=== modified file 'src/Ubuntu/Components/plugin/ucheader.h'
479--- src/Ubuntu/Components/plugin/ucheader.h 2016-04-05 12:49:22 +0000
480+++ src/Ubuntu/Components/plugin/ucheader.h 2016-05-13 09:11:41 +0000
481@@ -48,7 +48,7 @@
482 protected:
483 virtual void show(bool animate);
484 virtual void hide(bool animate);
485- virtual void itemChange(ItemChange change, const ItemChangeData &value);
486+ void itemChange(ItemChange change, const ItemChangeData &value) override;
487
488 private Q_SLOTS:
489 void _q_scrolledContents();
490
491=== modified file 'src/Ubuntu/Components/plugin/ucinversemouse.h'
492--- src/Ubuntu/Components/plugin/ucinversemouse.h 2014-04-15 12:51:31 +0000
493+++ src/Ubuntu/Components/plugin/ucinversemouse.h 2016-05-13 09:11:41 +0000
494@@ -28,18 +28,18 @@
495
496 static UCInverseMouse *qmlAttachedProperties(QObject *owner);
497
498- virtual void setEnabled(bool enabled);
499- virtual void setPriority(Priority priority);
500+ void setEnabled(bool enabled) override;
501+ void setPriority(Priority priority) override;
502 bool excludeInputArea() const;
503 void setExcludeInputArea(bool value);
504
505 protected:
506 QMouseEvent mapMouseToOwner(QObject *target, QMouseEvent* event);
507 QHoverEvent mapHoverToOwner(QObject *target, QHoverEvent *event);
508- virtual bool eventFilter(QObject *, QEvent *);
509- virtual bool mouseEvents(QObject *target, QMouseEvent *event);
510- virtual bool hoverEvents(QObject *target, QHoverEvent *event);
511- virtual bool hasAttachedFilter(QQuickItem *item);
512+ bool eventFilter(QObject *, QEvent *) override;
513+ bool mouseEvents(QObject *target, QMouseEvent *event) override;
514+ bool hoverEvents(QObject *target, QHoverEvent *event) override;
515+ bool hasAttachedFilter(QQuickItem *item) override;
516 bool pointInOSK(const QPointF &point);
517 bool contains(QMouseEvent *mouse);
518 };
519
520=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
521--- src/Ubuntu/Components/plugin/uclabel.h 2016-04-26 16:09:35 +0000
522+++ src/Ubuntu/Components/plugin/uclabel.h 2016-05-13 09:11:41 +0000
523@@ -70,11 +70,11 @@
524
525 protected:
526 // from QQuickItem
527- void classBegin();
528+ void classBegin() override;
529
530 // from UCItemExtension
531- void preThemeChanged(){}
532- void postThemeChanged();
533+ void preThemeChanged() override{}
534+ void postThemeChanged() override;
535
536 Q_SIGNALS:
537 void textSizeChanged();
538
539=== modified file 'src/Ubuntu/Components/plugin/uclistitem.h'
540--- src/Ubuntu/Components/plugin/uclistitem.h 2016-01-16 15:52:56 +0000
541+++ src/Ubuntu/Components/plugin/uclistitem.h 2016-05-13 09:11:41 +0000
542@@ -76,16 +76,16 @@
543
544 protected:
545 virtual QObject *attachedViewItems(QObject *object, bool create);
546- void classBegin();
547- void componentComplete();
548- QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
549- void itemChange(ItemChange change, const ItemChangeData &data);
550- void mousePressEvent(QMouseEvent *event);
551- void mouseReleaseEvent(QMouseEvent *event);
552- void mouseMoveEvent(QMouseEvent *event);
553- bool childMouseEventFilter(QQuickItem *child, QEvent *event);
554- bool eventFilter(QObject *, QEvent *);
555- void timerEvent(QTimerEvent *event);
556+ void classBegin() override;
557+ void componentComplete() override;
558+ QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data) override;
559+ void itemChange(ItemChange change, const ItemChangeData &data) override;
560+ void mousePressEvent(QMouseEvent *event) override;
561+ void mouseReleaseEvent(QMouseEvent *event) override;
562+ void mouseMoveEvent(QMouseEvent *event) override;
563+ bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
564+ bool eventFilter(QObject *, QEvent *) override;
565+ void timerEvent(QTimerEvent *event) override;
566 void focusInEvent(QFocusEvent *event) override;
567 void focusOutEvent(QFocusEvent *event) override;
568 void keyPressEvent(QKeyEvent *event) override;
569@@ -146,7 +146,7 @@
570 void colorToChanged();
571
572 protected:
573- QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *data);
574+ QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *data) override;
575
576 private:
577 void updateGradient();
578@@ -241,7 +241,7 @@
579 void heightChanged();
580
581 protected:
582- bool eventFilter(QObject *, QEvent *);
583+ bool eventFilter(QObject *, QEvent *) override;
584
585 private:
586 UCListItem *m_listItem;
587
588=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
589--- src/Ubuntu/Components/plugin/uclistitem_p.h 2016-01-16 15:52:56 +0000
590+++ src/Ubuntu/Components/plugin/uclistitem_p.h 2016-05-13 09:11:41 +0000
591@@ -109,8 +109,8 @@
592 QQmlListProperty<QQuickItem> children();
593 bool contentMoving() const;
594 void setContentMoving(bool moved);
595- virtual void preStyleChanged();
596- virtual bool loadStyleItem(bool animated = true);
597+ void preStyleChanged() override;
598+ bool loadStyleItem(bool animated = true) override;
599 bool dragging();
600 bool dragMode();
601 void setDragMode(bool draggable);
602
603=== modified file 'src/Ubuntu/Components/plugin/uclistitemstyle.h'
604--- src/Ubuntu/Components/plugin/uclistitemstyle.h 2015-09-04 09:32:31 +0000
605+++ src/Ubuntu/Components/plugin/uclistitemstyle.h 2016-05-13 09:11:41 +0000
606@@ -96,8 +96,8 @@
607 void rebound();
608
609 protected:
610- void classBegin();
611- void componentComplete();
612+ void classBegin() override;
613+ void componentComplete() override;
614
615 private:
616
617
618=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.h'
619--- src/Ubuntu/Components/plugin/ucmainviewbase.h 2016-04-04 04:47:11 +0000
620+++ src/Ubuntu/Components/plugin/ucmainviewbase.h 2016-05-13 09:11:41 +0000
621@@ -62,8 +62,8 @@
622 UCPopupContext* actionContext() const;
623
624 // QQmlParserStatus interface
625- virtual void componentComplete() override;
626- virtual void classBegin() override;
627+ void componentComplete() override;
628+ void classBegin() override;
629
630 Q_SIGNALS:
631 void applicationNameChanged(QString applicationName);
632
633=== modified file 'src/Ubuntu/Components/plugin/ucmouse.h'
634--- src/Ubuntu/Components/plugin/ucmouse.h 2015-12-03 15:43:23 +0000
635+++ src/Ubuntu/Components/plugin/ucmouse.h 2016-05-13 09:11:41 +0000
636@@ -114,8 +114,8 @@
637 void exited(QQuickMouseEvent *event, QQuickItem *host);
638
639 protected:
640- virtual bool eventFilter(QObject *, QEvent *);
641- virtual void timerEvent(QTimerEvent *event);
642+ bool eventFilter(QObject *, QEvent *) override;
643+ void timerEvent(QTimerEvent *event) override;
644 virtual bool mouseEvents(QObject *target, QMouseEvent *event);
645 virtual bool hoverEvents(QObject *target, QHoverEvent *event);
646 virtual bool forwardedEvents(ForwardedEvent *event);
647
648=== modified file 'src/Ubuntu/Components/plugin/ucpagetreenode.h'
649--- src/Ubuntu/Components/plugin/ucpagetreenode.h 2016-02-02 16:43:30 +0000
650+++ src/Ubuntu/Components/plugin/ucpagetreenode.h 2016-05-13 09:11:41 +0000
651@@ -58,7 +58,7 @@
652 bool isPageTreeNode() const;
653
654 // QQmlParserStatus interface
655- virtual void componentComplete() override;
656+ void componentComplete() override;
657
658 Q_INVOKABLE void dumpNodeTree ();
659
660@@ -78,7 +78,7 @@
661 void setActiveLeafNode(QQuickItem* activeLeafNode);
662
663 // QQuickItem interface
664- virtual void itemChange(ItemChange change, const ItemChangeData &value) override;
665+ void itemChange(ItemChange change, const ItemChangeData &value) override;
666
667 private:
668 Q_DECLARE_PRIVATE(UCPageTreeNode)
669
670=== modified file 'src/Ubuntu/Components/plugin/ucproportionalshape.h'
671--- src/Ubuntu/Components/plugin/ucproportionalshape.h 2016-02-17 19:32:41 +0000
672+++ src/Ubuntu/Components/plugin/ucproportionalshape.h 2016-05-13 09:11:41 +0000
673@@ -33,7 +33,7 @@
674 void _q_updateHeight();
675
676 private:
677- void componentComplete();
678+ void componentComplete() override;
679
680 Q_DISABLE_COPY(UCProportionalShape)
681 };
682
683=== modified file 'src/Ubuntu/Components/plugin/ucscalingimageprovider.h'
684--- src/Ubuntu/Components/plugin/ucscalingimageprovider.h 2012-10-28 00:57:40 +0000
685+++ src/Ubuntu/Components/plugin/ucscalingimageprovider.h 2016-05-13 09:11:41 +0000
686@@ -26,7 +26,7 @@
687 {
688 public:
689 explicit UCScalingImageProvider();
690- QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
691+ QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
692 };
693
694 #endif // SCALINGIMAGEPROVIDER_H
695
696=== modified file 'src/Ubuntu/Components/plugin/ucserviceproperties.h'
697--- src/Ubuntu/Components/plugin/ucserviceproperties.h 2014-11-26 15:39:39 +0000
698+++ src/Ubuntu/Components/plugin/ucserviceproperties.h 2016-05-13 09:11:41 +0000
699@@ -50,8 +50,8 @@
700
701 explicit UCServiceProperties(QObject *parent = 0);
702 ~UCServiceProperties();
703- void classBegin();
704- void componentComplete();
705+ void classBegin() override;
706+ void componentComplete() override;
707
708 ServiceType type() const;
709 void setType(ServiceType type);
710
711=== modified file 'src/Ubuntu/Components/plugin/ucslotslayout.h'
712--- src/Ubuntu/Components/plugin/ucslotslayout.h 2015-11-10 11:39:51 +0000
713+++ src/Ubuntu/Components/plugin/ucslotslayout.h 2016-05-13 09:11:41 +0000
714@@ -56,8 +56,8 @@
715
716 protected:
717 Q_DECLARE_PRIVATE(UCSlotsLayout)
718- void componentComplete();
719- void itemChange(ItemChange change, const ItemChangeData &data);
720+ void componentComplete() override;
721+ void itemChange(ItemChange change, const ItemChangeData &data) override;
722
723 private:
724 Q_PRIVATE_SLOT(d_func(), void _q_onGuValueChanged())
725
726=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.h'
727--- src/Ubuntu/Components/plugin/ucstyleditembase.h 2016-04-25 10:45:41 +0000
728+++ src/Ubuntu/Components/plugin/ucstyleditembase.h 2016-05-13 09:11:41 +0000
729@@ -70,16 +70,16 @@
730 UCStyledItemBase(UCStyledItemBasePrivate &, QQuickItem *parent);
731
732 // from UCThemingExtension interface
733- virtual void preThemeChanged();
734- virtual void postThemeChanged();
735+ void preThemeChanged() override;
736+ void postThemeChanged() override;
737
738- void classBegin();
739- void componentComplete();
740- void itemChange(ItemChange change, const ItemChangeData &data);
741- void focusInEvent(QFocusEvent *key);
742+ void classBegin() override;
743+ void componentComplete() override;
744+ void itemChange(ItemChange change, const ItemChangeData &data) override;
745+ void focusInEvent(QFocusEvent *key) override;
746 void setKeyNavigationFocus(bool value);
747- void mousePressEvent(QMouseEvent *event);
748- bool childMouseEventFilter(QQuickItem *child, QEvent *event);
749+ void mousePressEvent(QMouseEvent *event) override;
750+ bool childMouseEventFilter(QQuickItem *child, QEvent *event) override;
751
752 private:
753 Q_DECLARE_PRIVATE(UCStyledItemBase)
754
755=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
756--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h 2016-01-16 10:55:26 +0000
757+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h 2016-05-13 09:11:41 +0000
758@@ -59,7 +59,7 @@
759 virtual void completeComponentInitialization();
760
761 // from UCImportVersionChecker
762- virtual QString propertyForVersion(quint16 version) const;
763+ QString propertyForVersion(quint16 version) const override;
764
765 public:
766
767
768=== modified file 'src/Ubuntu/Components/plugin/ucstylehints.h'
769--- src/Ubuntu/Components/plugin/ucstylehints.h 2015-06-02 12:37:41 +0000
770+++ src/Ubuntu/Components/plugin/ucstylehints.h 2016-05-13 09:11:41 +0000
771@@ -45,8 +45,8 @@
772 void _q_applyStyleHints();
773
774 protected:
775- void classBegin();
776- void componentComplete();
777+ void classBegin() override;
778+ void componentComplete() override;
779
780 private:
781 class Expression {
782@@ -82,8 +82,8 @@
783 public:
784 UCStyleHintsParser() : QQmlCustomParser(QQmlCustomParser::AcceptsSignalHandlers) {}
785
786- virtual void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
787- virtual void applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings);
788+ void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings) override;
789+ void applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings) override;
790
791 private:
792 void verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding);
793
794=== modified file 'src/Ubuntu/Components/plugin/uctheme.h'
795--- src/Ubuntu/Components/plugin/uctheme.h 2016-02-25 17:45:27 +0000
796+++ src/Ubuntu/Components/plugin/uctheme.h 2016-05-13 09:11:41 +0000
797@@ -90,8 +90,8 @@
798 void versionChanged();
799
800 protected:
801- void classBegin();
802- void componentComplete()
803+ void classBegin() override;
804+ void componentComplete() override
805 {
806 m_completed = true;
807 }
808
809=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.cpp'
810--- src/Ubuntu/Components/plugin/ucthemingextension.cpp 2016-01-12 13:48:53 +0000
811+++ src/Ubuntu/Components/plugin/ucthemingextension.cpp 2016-05-13 09:11:41 +0000
812@@ -75,7 +75,7 @@
813 QQuickItem *m_item;
814 QQuickItem *m_prevParent;
815
816- void itemParentChanged(QQuickItem *item, QQuickItem *newParent);
817+ void itemParentChanged(QQuickItem *item, QQuickItem *newParent) override;
818
819 private:
820
821
822=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.h'
823--- src/Ubuntu/Components/plugin/ucubuntushape.h 2015-12-10 06:25:58 +0000
824+++ src/Ubuntu/Components/plugin/ucubuntushape.h 2016-05-13 09:11:41 +0000
825@@ -31,10 +31,10 @@
826 {
827 public:
828 ShapeShader();
829- virtual char const* const* attributeNames() const;
830- virtual void initialize();
831- virtual void updateState(
832- const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect);
833+ char const* const* attributeNames() const override;
834+ void initialize() override;
835+ void updateState(
836+ const RenderState& state, QSGMaterial* newEffect, QSGMaterial* oldEffect) override;
837 bool useDistanceFields() const { return m_useDistanceFields; }
838
839 private:
840@@ -73,9 +73,9 @@
841 };
842
843 ShapeMaterial();
844- virtual QSGMaterialType* type() const;
845- virtual QSGMaterialShader* createShader() const;
846- virtual int compare(const QSGMaterial* other) const;
847+ QSGMaterialType* type() const override;
848+ QSGMaterialShader* createShader() const override;
849+ int compare(const QSGMaterial* other) const override;
850 virtual void updateTextures();
851 const Data* constData() const { return &m_data; }
852 Data* data() { return &m_data; }
853@@ -110,7 +110,7 @@
854 ShapeNode();
855 ShapeMaterial* material() { return &m_material; }
856 QSGGeometry* geometry() { return &m_geometry; }
857- void preprocess() { m_material.updateTextures(); }
858+ void preprocess() override { m_material.updateTextures(); }
859
860 private:
861 ShapeMaterial m_material;
862@@ -286,10 +286,10 @@
863 void verticalAlignmentChanged();
864
865 protected:
866- virtual QString propertyForVersion(quint16 version) const;
867- virtual void componentComplete();
868- virtual QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data);
869- virtual void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry);
870+ QString propertyForVersion(quint16 version) const override;
871+ void componentComplete() override;
872+ QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* data) override;
873+ void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) override;
874
875 // Virtual functions for extended shapes.
876 virtual QSGNode* createSceneGraphNode() const;
877
878=== modified file 'src/Ubuntu/Components/plugin/ucubuntushapeoverlay.h'
879--- src/Ubuntu/Components/plugin/ucubuntushapeoverlay.h 2015-09-10 11:04:16 +0000
880+++ src/Ubuntu/Components/plugin/ucubuntushapeoverlay.h 2016-05-13 09:11:41 +0000
881@@ -27,7 +27,7 @@
882 {
883 public:
884 ShapeOverlayShader();
885- virtual char const* const* attributeNames() const;
886+ char const* const* attributeNames() const override;
887 };
888
889 // --- Scene graph material ---
890@@ -35,8 +35,8 @@
891 class ShapeOverlayMaterial : public ShapeMaterial
892 {
893 public:
894- virtual QSGMaterialType* type() const;
895- virtual QSGMaterialShader* createShader() const;
896+ QSGMaterialType* type() const override;
897+ QSGMaterialShader* createShader() const override;
898 };
899
900 // --- Scene graph node ---
901@@ -58,7 +58,7 @@
902
903 ShapeOverlayNode();
904 QSGGeometry* geometry() { return &m_geometry; }
905- void preprocess() { m_material.updateTextures(); }
906+ void preprocess() override { m_material.updateTextures(); }
907
908 private:
909 ShapeOverlayMaterial m_material;
910@@ -92,11 +92,11 @@
911 void overlayColorChanged();
912
913 protected:
914- virtual QSGNode* createSceneGraphNode() const;
915- virtual void updateGeometry(
916+ QSGNode* createSceneGraphNode() const override;
917+ void updateGeometry(
918 QSGNode* node, const QSizeF& itemSize, float radius, float shapeOffset,
919 const QVector4D& sourceCoordTransform, const QVector4D& sourceMaskTransform,
920- const quint32 backgroundColor[3]);
921+ const quint32 backgroundColor[3]) override;
922
923 private:
924 quint16 m_overlayX;
925
926=== modified file 'src/Ubuntu/Components/plugin/unitythemeiconprovider.h'
927--- src/Ubuntu/Components/plugin/unitythemeiconprovider.h 2016-05-06 08:53:16 +0000
928+++ src/Ubuntu/Components/plugin/unitythemeiconprovider.h 2016-05-13 09:11:41 +0000
929@@ -25,7 +25,7 @@
930 {
931 public:
932 UnityThemeIconProvider(const QString &themeName = QStringLiteral("suru"));
933- QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize);
934+ QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
935
936 private:
937 QSharedPointer<class IconTheme> theme;
938
939=== modified file 'src/Ubuntu/Layouts/plugin/propertychanges_p.h'
940--- src/Ubuntu/Layouts/plugin/propertychanges_p.h 2016-03-16 17:20:49 +0000
941+++ src/Ubuntu/Layouts/plugin/propertychanges_p.h 2016-05-13 09:11:41 +0000
942@@ -116,7 +116,7 @@
943 public:
944 ParentChange(QQuickItem *item, QQuickItem *targetParent, bool topmostChild);
945
946- void apply();
947+ void apply() override;
948 private:
949 QQuickItem *newParent;
950 bool topmostChild;
951@@ -128,8 +128,8 @@
952 public:
953 AnchorChange(QQuickItem *item, const QString &anchor, QQuickItem *target, const QString &targetAnchor = QString());
954
955- void apply();
956- void revert();
957+ void apply() override;
958+ void revert() override;
959 private:
960 bool active;
961 };
962@@ -139,11 +139,11 @@
963 {
964 public:
965 ItemStackBackup(QQuickItem *item);
966- void apply() {}
967- void revert();
968+ void apply() override {}
969+ void revert() override;
970
971 protected:
972- virtual void saveState();
973+ void saveState() override;
974 QQuickItem *target;
975 QQuickItem *prevItem;
976 private:
977@@ -157,10 +157,10 @@
978 public:
979 AnchorBackup(QQuickItem *item);
980
981- void apply();
982- void revert();
983+ void apply() override;
984+ void revert() override;
985 protected:
986- virtual void saveState();
987+ void saveState() override;
988
989 enum Anchor{
990 Left = 0,
991
992=== modified file 'src/Ubuntu/Layouts/plugin/ullayouts.h'
993--- src/Ubuntu/Layouts/plugin/ullayouts.h 2014-05-14 11:24:48 +0000
994+++ src/Ubuntu/Layouts/plugin/ullayouts.h 2016-05-13 09:11:41 +0000
995@@ -73,8 +73,8 @@
996 void currentLayoutChanged();
997
998 protected:
999- void componentComplete();
1000- void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
1001+ void componentComplete() override;
1002+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
1003
1004 private:
1005 QQmlListProperty<ULConditionalLayout> layouts();
1006
1007=== modified file 'src/Ubuntu/Layouts/plugin/ullayouts_p.h'
1008--- src/Ubuntu/Layouts/plugin/ullayouts_p.h 2014-05-16 08:33:43 +0000
1009+++ src/Ubuntu/Layouts/plugin/ullayouts_p.h 2016-05-13 09:11:41 +0000
1010@@ -42,8 +42,8 @@
1011 static void warning(QObject *item, const QString &message);
1012
1013 protected: // QQmlIncubator stuff
1014- void setInitialState(QObject *object);
1015- void statusChanged(Status status);
1016+ void setInitialState(QObject *object) override;
1017+ void statusChanged(Status status) override;
1018
1019 private:
1020 ULLayouts *q_ptr;
1021
1022=== modified file 'src/Ubuntu/Layouts/plugin/ulplugin.h'
1023--- src/Ubuntu/Layouts/plugin/ulplugin.h 2014-04-20 19:25:12 +0000
1024+++ src/Ubuntu/Layouts/plugin/ulplugin.h 2016-05-13 09:11:41 +0000
1025@@ -27,7 +27,7 @@
1026 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
1027
1028 public:
1029- void registerTypes(const char *uri);
1030+ void registerTypes(const char *uri) override;
1031 private:
1032 void registerTypeVersions(const char *uri, int major, int minor);
1033 };
1034
1035=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmcpuusage.h'
1036--- src/Ubuntu/PerformanceMetrics/plugin/upmcpuusage.h 2014-02-20 12:09:26 +0000
1037+++ src/Ubuntu/PerformanceMetrics/plugin/upmcpuusage.h 2016-05-13 09:11:41 +0000
1038@@ -52,7 +52,7 @@
1039 void samplingIntervalChanged();
1040
1041 protected:
1042- void itemChange(ItemChange change, const ItemChangeData & value);
1043+ void itemChange(ItemChange change, const ItemChangeData & value) override;
1044
1045 private Q_SLOTS:
1046 void connectToWindow(QQuickWindow* window);
1047
1048=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmplugin.h'
1049--- src/Ubuntu/PerformanceMetrics/plugin/upmplugin.h 2014-04-20 19:25:12 +0000
1050+++ src/Ubuntu/PerformanceMetrics/plugin/upmplugin.h 2016-05-13 09:11:41 +0000
1051@@ -27,8 +27,8 @@
1052 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
1053
1054 public:
1055- void registerTypes(const char *uri);
1056- void initializeEngine(QQmlEngine *engine, const char *uri);
1057+ void registerTypes(const char *uri) override;
1058+ void initializeEngine(QQmlEngine *engine, const char *uri) override;
1059 private:
1060 void registerTypeVersion(const char *uri, int major, int minor);
1061 };
1062
1063=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmrenderingtimes.h'
1064--- src/Ubuntu/PerformanceMetrics/plugin/upmrenderingtimes.h 2014-02-11 17:40:02 +0000
1065+++ src/Ubuntu/PerformanceMetrics/plugin/upmrenderingtimes.h 2016-05-13 09:11:41 +0000
1066@@ -58,7 +58,7 @@
1067 void frameRendered(qint64 renderTime);
1068
1069 protected:
1070- void itemChange(ItemChange change, const ItemChangeData & value);
1071+ void itemChange(ItemChange change, const ItemChangeData & value) override;
1072
1073 private Q_SLOTS:
1074 void connectToWindow(QQuickWindow* window);
1075
1076=== modified file 'src/Ubuntu/PerformanceMetrics/plugin/upmtexturefromimage.h'
1077--- src/Ubuntu/PerformanceMetrics/plugin/upmtexturefromimage.h 2014-01-21 18:35:24 +0000
1078+++ src/Ubuntu/PerformanceMetrics/plugin/upmtexturefromimage.h 2016-05-13 09:11:41 +0000
1079@@ -29,7 +29,7 @@
1080 public:
1081 explicit UPMTextureFromImageTextureProvider();
1082 virtual ~UPMTextureFromImageTextureProvider();
1083- QSGTexture* texture() const;
1084+ QSGTexture* texture() const override;
1085 void setTexture(QSGTexture* texture);
1086
1087 private:
1088@@ -46,9 +46,9 @@
1089 public:
1090 explicit UPMTextureFromImage(QQuickItem* parent = 0);
1091 virtual ~UPMTextureFromImage();
1092- bool isTextureProvider() const;
1093- QSGTextureProvider* textureProvider() const;
1094- QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData);
1095+ bool isTextureProvider() const override;
1096+ QSGTextureProvider* textureProvider() const override;
1097+ QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData) override;
1098
1099 // getter
1100 QImage image() const;
1101
1102=== modified file 'src/Ubuntu/Test/plugin/testplugin.h'
1103--- src/Ubuntu/Test/plugin/testplugin.h 2014-06-18 05:23:46 +0000
1104+++ src/Ubuntu/Test/plugin/testplugin.h 2016-05-13 09:11:41 +0000
1105@@ -25,7 +25,7 @@
1106 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
1107
1108 public:
1109- void registerTypes(const char *uri);
1110+ void registerTypes(const char *uri) override;
1111 };
1112
1113 #endif // TESTPLUGIN_H
1114
1115=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
1116--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h 2016-04-04 10:16:08 +0000
1117+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h 2016-05-13 09:11:41 +0000
1118@@ -35,7 +35,7 @@
1119 ~MouseTouchAdaptorPrivate();
1120
1121 virtual void init() {}
1122- virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result)
1123+ bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) override
1124 { Q_UNUSED(eventType); Q_UNUSED(message); Q_UNUSED(result); return false; }
1125 bool isEnabled() const;
1126 virtual void setEnabled(bool enabled);
1127@@ -55,7 +55,7 @@
1128
1129 void init() Q_DECL_OVERRIDE;
1130 bool nativeEventFilter(const QByteArray & eventType, void *message, long *result) Q_DECL_OVERRIDE;
1131- void setEnabled(bool value);
1132+ void setEnabled(bool value) override;
1133
1134 bool xi2HandleEvent(xcb_ge_event_t *event);
1135 bool handleButtonPress(WId windowId, uint32_t detail, uint32_t modifiers, int x, int y);
1136
1137=== modified file 'tests/api/Extinct/Animals/plugin/plugin.h'
1138--- tests/api/Extinct/Animals/plugin/plugin.h 2015-12-02 09:22:28 +0000
1139+++ tests/api/Extinct/Animals/plugin/plugin.h 2016-05-13 09:11:41 +0000
1140@@ -26,8 +26,8 @@
1141 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
1142
1143 public:
1144- void registerTypes(const char *uri);
1145- void initializeEngine(QQmlEngine *engine, const char *uri);
1146+ void registerTypes(const char *uri) override;
1147+ void initializeEngine(QQmlEngine *engine, const char *uri) override;
1148 };
1149
1150 #endif // EXTINCT_ANIMALS_PLUGIN_H
1151
1152=== modified file 'tests/unit_x11/tst_components/tabsmodel.h'
1153--- tests/unit_x11/tst_components/tabsmodel.h 2013-11-26 12:44:39 +0000
1154+++ tests/unit_x11/tst_components/tabsmodel.h 2016-05-13 09:11:41 +0000
1155@@ -28,9 +28,9 @@
1156
1157 public:
1158 TabsModel();
1159- int rowCount(const QModelIndex &parent = QModelIndex()) const;
1160- QVariant data(const QModelIndex&, int) const;
1161- QHash<int, QByteArray> roleNames() const;
1162+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
1163+ QVariant data(const QModelIndex&, int) const override;
1164+ QHash<int, QByteArray> roleNames() const override;
1165
1166 Q_INVOKABLE void append(const QString &title);
1167 Q_INVOKABLE QVariantMap get(int index);
1168
1169=== modified file 'tests/unit_x11/tst_components/tst_components.pro'
1170--- tests/unit_x11/tst_components/tst_components.pro 2015-09-14 11:39:11 +0000
1171+++ tests/unit_x11/tst_components/tst_components.pro 2016-05-13 09:11:41 +0000
1172@@ -4,6 +4,8 @@
1173
1174 TARGET = tst_components
1175
1176+CONFIG += c++11
1177+
1178 SOURCES += tst_components.cpp tabsmodel.cpp
1179 HEADERS += tabsmodel.h
1180

Subscribers

People subscribed via source and target branches