Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/verbatimNamespaces into lp:ubuntu-ui-toolkit/staging

  1. verbatimNamespaces
  2. Merge into staging
Proposed by Christian Dywan on 2016-06-28
Status: Merged
Approved by: Christian Dywan on 2016-06-30
Approved revision: 2025
Merged at revision: 2023
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/verbatimNamespaces
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 1838 lines (+227/-133)
131 files modified
debian/libubuntugestures5-dev.install (+10/-0)
debian/libubuntutoolkit5-dev.install (+79/-0)
src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h (+1/-1)
src/Ubuntu/UbuntuGestures/timer.h (+1/-1)
src/Ubuntu/UbuntuGestures/timesource.h (+2/-2)
src/Ubuntu/UbuntuGestures/touchownershipevent.h (+1/-1)
src/Ubuntu/UbuntuGestures/touchregistry.h (+1/-1)
src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h (+1/-1)
src/Ubuntu/UbuntuGestures/ucswipearea.cpp (+1/-1)
src/Ubuntu/UbuntuGestures/ucswipearea_p.h (+1/-1)
src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h (+1/-1)
src/Ubuntu/UbuntuGestures/unownedtouchevent.h (+1/-1)
src/Ubuntu/UbuntuToolkit/alarmmanager_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/asyncloader.h (+1/-1)
src/Ubuntu/UbuntuToolkit/asyncloader_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/colorutils.h (+1/-1)
src/Ubuntu/UbuntuToolkit/filterbehavior.h (+1/-1)
src/Ubuntu/UbuntuToolkit/i18n.h (+1/-1)
src/Ubuntu/UbuntuToolkit/inversemouseareatype.h (+1/-1)
src/Ubuntu/UbuntuToolkit/label_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/listener.h (+1/-1)
src/Ubuntu/UbuntuToolkit/livetimer.h (+1/-1)
src/Ubuntu/UbuntuToolkit/livetimer_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h (+1/-1)
src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/propertychange.h (+1/-1)
src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/qquickclipboard.h (+1/-1)
src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/qquickmimedata.h (+1/-1)
src/Ubuntu/UbuntuToolkit/quickutils.h (+1/-1)
src/Ubuntu/UbuntuToolkit/sortbehavior.h (+1/-1)
src/Ubuntu/UbuntuToolkit/sortfiltermodel.h (+6/-1)
src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/timeutils_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/tree.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucabstractbutton.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucaction.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucaction.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp (+2/-2)
src/Ubuntu/UbuntuToolkit/ucactioncontext.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucactionitem.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucactionitem.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucactionitem_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucactionmanager.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucalarm.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucalarm.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucalarm_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucalarmmodel.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucapplication.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucargument.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucarguments.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedge.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgehint.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucdefaulttheme.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucfontutils.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucfontutils.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uchaptics.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucheader.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucheader.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucinversemouse.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uclabel.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uclabel.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitem.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitem.h (+2/-2)
src/Ubuntu/UbuntuToolkit/uclistitem_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemactions.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemactions.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemactions_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemlayout.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemstyle.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemstyle.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucmainviewbase.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucmainviewbase_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucmargins.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucmathutils.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucmouse.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucmousefilters.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucpagetreenode.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucpagetreenode_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucperformancemonitor.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucproportionalshape.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucqquickimageextension.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucscalingimageprovider.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucserviceproperties.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucserviceproperties.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucserviceproperties_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucslotslayout.h (+2/-2)
src/Ubuntu/UbuntuToolkit/ucslotslayout_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstatesaver.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstatesaver.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstatesaver_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstyleditembase.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstyleditembase.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstylehints.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstylehints.h (+1/-1)
src/Ubuntu/UbuntuToolkit/uctheme.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uctheme.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucthemingextension.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucubuntuanimation.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucubuntushape.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucunits.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucurihandler.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucurihandler.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucviewitemsattached.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/unitythemeiconprovider.h (+1/-1)
src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.h (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/verbatimNamespaces
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-06-30
Zoltan Balogh (community) 2016-06-28 Approve on 2016-06-29
Review via email: mp+298519@code.launchpad.net

Commit Message

Stop using macros for namespaces in headers

To post a comment you must log in.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/496/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/966/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/996/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/777/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/751/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4099/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4095
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4096
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4097
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4098

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

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2023
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/497/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/967/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/997/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/778/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/752/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4105/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4100
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4103
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4102
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4104

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

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2024
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/498/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/969/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/998/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/779/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/753
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4110/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4106
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4108
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4107
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4109

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

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2025
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/499/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/970
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/999
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/780
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/754
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4115/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4114
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4112
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4111
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4113

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

review: Approve (continuous-integration)
Zoltan Balogh (bzoltan) wrote :

go

review: Approve
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
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/363/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/972/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1001
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/782
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/756
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/371/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4116
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4125
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4124
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4126

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
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/365/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/976/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1004
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/785
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/759
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/373/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4127
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4137
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4138
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4139

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
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/366/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/979/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1007
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/788
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/762
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/374/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4144
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4151
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4150
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4152

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
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/367/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/981/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1009
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/790
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/764
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/375/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4153
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4159
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4160
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4161

review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/libubuntugestures5-dev.install'
2--- debian/libubuntugestures5-dev.install 2016-06-22 13:15:15 +0000
3+++ debian/libubuntugestures5-dev.install 2016-06-29 09:35:37 +0000
4@@ -1,6 +1,16 @@
5+usr/include/*/qt5/UbuntuGestures/AbstractTimer
6+usr/include/*/qt5/UbuntuGestures/AbstractTimerFactory
7+usr/include/*/qt5/UbuntuGestures/CandidateInactivityTimer
8 usr/include/*/qt5/UbuntuGestures/DebugHelpers
9+usr/include/*/qt5/UbuntuGestures/FakeTimeSource
10+usr/include/*/qt5/UbuntuGestures/FakeTimer
11+usr/include/*/qt5/UbuntuGestures/FakeTimerFactory
12 usr/include/*/qt5/UbuntuGestures/Pool
13+usr/include/*/qt5/UbuntuGestures/RealTimeSource
14+usr/include/*/qt5/UbuntuGestures/SharedTimeSource
15+usr/include/*/qt5/UbuntuGestures/TimeSource
16 usr/include/*/qt5/UbuntuGestures/Timer
17+usr/include/*/qt5/UbuntuGestures/TimerFactory
18 usr/include/*/qt5/UbuntuGestures/TouchOwnershipEvent
19 usr/include/*/qt5/UbuntuGestures/TouchRegistry
20 usr/include/*/qt5/UbuntuGestures/UbuntuGestures
21
22=== modified file 'debian/libubuntutoolkit5-dev.install'
23--- debian/libubuntutoolkit5-dev.install 2016-06-22 13:49:20 +0000
24+++ debian/libubuntutoolkit5-dev.install 2016-06-29 09:35:37 +0000
25@@ -1,8 +1,87 @@
26+usr/include/*/qt5/UbuntuToolkit/AsyncLoader
27+usr/include/*/qt5/UbuntuToolkit/ColorUtils
28+usr/include/*/qt5/UbuntuToolkit/ContextPropertyChangeListener
29+usr/include/*/qt5/UbuntuToolkit/FilterBehavior
30+usr/include/*/qt5/UbuntuToolkit/ForwardedEvent
31+usr/include/*/qt5/UbuntuToolkit/HapticsProxy
32+usr/include/*/qt5/UbuntuToolkit/InverseMouseAreaType
33+usr/include/*/qt5/UbuntuToolkit/LiveTimer
34+usr/include/*/qt5/UbuntuToolkit/MouseTouchAdaptor
35+usr/include/*/qt5/UbuntuToolkit/PropertyChange
36 usr/include/*/qt5/UbuntuToolkit/QQuickClipboard
37+usr/include/*/qt5/UbuntuToolkit/QQuickMimeData
38+usr/include/*/qt5/UbuntuToolkit/QSortFilterProxyModelQML
39+usr/include/*/qt5/UbuntuToolkit/QuickUtils
40+usr/include/*/qt5/UbuntuToolkit/ShapeMaterial
41+usr/include/*/qt5/UbuntuToolkit/ShapeNode
42+usr/include/*/qt5/UbuntuToolkit/ShapeOverlayMaterial
43+usr/include/*/qt5/UbuntuToolkit/ShapeOverlayNode
44+usr/include/*/qt5/UbuntuToolkit/ShapeOverlayShader
45+usr/include/*/qt5/UbuntuToolkit/ShapeShader
46+usr/include/*/qt5/UbuntuToolkit/SortBehavior
47+usr/include/*/qt5/UbuntuToolkit/Tree
48+usr/include/*/qt5/UbuntuToolkit/UCAbstractButton
49+usr/include/*/qt5/UbuntuToolkit/UCAction
50+usr/include/*/qt5/UbuntuToolkit/UCActionContext
51+usr/include/*/qt5/UbuntuToolkit/UCActionContextAttached
52+usr/include/*/qt5/UbuntuToolkit/UCActionItem
53+usr/include/*/qt5/UbuntuToolkit/UCActionManager
54+usr/include/*/qt5/UbuntuToolkit/UCAlarm
55+usr/include/*/qt5/UbuntuToolkit/UCAlarmModel
56+usr/include/*/qt5/UbuntuToolkit/UCApplication
57+usr/include/*/qt5/UbuntuToolkit/UCArgument
58+usr/include/*/qt5/UbuntuToolkit/UCArguments
59+usr/include/*/qt5/UbuntuToolkit/UCBottomEdge
60+usr/include/*/qt5/UbuntuToolkit/UCBottomEdgeHint
61+usr/include/*/qt5/UbuntuToolkit/UCBottomEdgeRegion
62+usr/include/*/qt5/UbuntuToolkit/UCBottomEdgeStyle
63+usr/include/*/qt5/UbuntuToolkit/UCDefaultTheme
64+usr/include/*/qt5/UbuntuToolkit/UCDeprecatedTheme
65+usr/include/*/qt5/UbuntuToolkit/UCFontUtils
66+usr/include/*/qt5/UbuntuToolkit/UCHaptics
67+usr/include/*/qt5/UbuntuToolkit/UCHeader
68+usr/include/*/qt5/UbuntuToolkit/UCInverseMouse
69+usr/include/*/qt5/UbuntuToolkit/UCLabel
70+usr/include/*/qt5/UbuntuToolkit/UCListItem
71+usr/include/*/qt5/UbuntuToolkit/UCListItemActions
72+usr/include/*/qt5/UbuntuToolkit/UCListItemDivider
73+usr/include/*/qt5/UbuntuToolkit/UCListItemLayout
74+usr/include/*/qt5/UbuntuToolkit/UCListItemStyle
75+usr/include/*/qt5/UbuntuToolkit/UCMainViewBase
76+usr/include/*/qt5/UbuntuToolkit/UCMargins
77+usr/include/*/qt5/UbuntuToolkit/UCMathUtils
78+usr/include/*/qt5/UbuntuToolkit/UCMouse
79+usr/include/*/qt5/UbuntuToolkit/UCPageTreeNode
80+usr/include/*/qt5/UbuntuToolkit/UCPerformanceMonitor
81+usr/include/*/qt5/UbuntuToolkit/UCPopupContext
82+usr/include/*/qt5/UbuntuToolkit/UCProportionalShape
83+usr/include/*/qt5/UbuntuToolkit/UCQQuickImageExtension
84+usr/include/*/qt5/UbuntuToolkit/UCScalingImageProvider
85+usr/include/*/qt5/UbuntuToolkit/UCServiceProperties
86+usr/include/*/qt5/UbuntuToolkit/UCSlotsLayout
87+usr/include/*/qt5/UbuntuToolkit/UCStateSaver
88+usr/include/*/qt5/UbuntuToolkit/UCStateSaverAttached
89+usr/include/*/qt5/UbuntuToolkit/UCStyleHints
90+usr/include/*/qt5/UbuntuToolkit/UCStyleHintsParser
91+usr/include/*/qt5/UbuntuToolkit/UCStyledItemBase
92+usr/include/*/qt5/UbuntuToolkit/UCSwipeEvent
93+usr/include/*/qt5/UbuntuToolkit/UCTheme
94+usr/include/*/qt5/UbuntuToolkit/UCThemingExtension
95+usr/include/*/qt5/UbuntuToolkit/UCUbuntuAnimation
96+usr/include/*/qt5/UbuntuToolkit/UCUbuntuShape
97+usr/include/*/qt5/UbuntuToolkit/UCUbuntuShapeOverlay
98+usr/include/*/qt5/UbuntuToolkit/UCUnits
99+usr/include/*/qt5/UbuntuToolkit/UCUriHandler
100+usr/include/*/qt5/UbuntuToolkit/UCViewItemsAttached
101+usr/include/*/qt5/UbuntuToolkit/UbuntuI18n
102+usr/include/*/qt5/UbuntuToolkit/UbuntuLabsModule
103+usr/include/*/qt5/UbuntuToolkit/UbuntuStylesModule
104 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkit
105 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitDepends
106 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitModule
107 usr/include/*/qt5/UbuntuToolkit/UbuntuToolkitVersion
108+usr/include/*/qt5/UbuntuToolkit/UnityThemeIconProvider
109+usr/include/*/qt5/UbuntuToolkit/UriHandlerObject
110 usr/include/*/qt5/UbuntuToolkit/appheaderbase.h
111 usr/include/*/qt5/UbuntuToolkit/asyncloader.h
112 usr/include/*/qt5/UbuntuToolkit/colorutils.h
113
114=== modified file 'src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h'
115--- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h 2016-06-21 14:21:46 +0000
116+++ src/Ubuntu/UbuntuGestures/candidateinactivitytimer.h 2016-06-29 09:35:37 +0000
117@@ -23,7 +23,7 @@
118
119 #include "timer.h"
120
121-UG_NAMESPACE_BEGIN
122+namespace UbuntuGestures {
123
124 class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
125 Q_OBJECT
126
127=== modified file 'src/Ubuntu/UbuntuGestures/timer.h'
128--- src/Ubuntu/UbuntuGestures/timer.h 2016-06-21 14:21:46 +0000
129+++ src/Ubuntu/UbuntuGestures/timer.h 2016-06-29 09:35:37 +0000
130@@ -24,7 +24,7 @@
131 #include <QPointer>
132 #include <QTimer>
133
134-UG_NAMESPACE_BEGIN
135+namespace UbuntuGestures {
136
137 /* Defines an interface for a Timer. */
138 class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject
139
140=== modified file 'src/Ubuntu/UbuntuGestures/timesource.h'
141--- src/Ubuntu/UbuntuGestures/timesource.h 2016-06-21 14:21:46 +0000
142+++ src/Ubuntu/UbuntuGestures/timesource.h 2016-06-29 09:35:37 +0000
143@@ -22,7 +22,7 @@
144 #include "ubuntugesturesglobal.h"
145 #include <QSharedPointer>
146
147-UG_NAMESPACE_BEGIN
148+namespace UbuntuGestures {
149 /*
150 Interface for a time source.
151 */
152@@ -57,6 +57,6 @@
153 qint64 m_msecsSinceReference;
154 };
155
156-UG_NAMESPACE_END
157+}
158
159 #endif // UBUNTUGESTURES_TIMESOURCE_H
160
161=== modified file 'src/Ubuntu/UbuntuGestures/touchownershipevent.h'
162--- src/Ubuntu/UbuntuGestures/touchownershipevent.h 2016-06-21 14:21:46 +0000
163+++ src/Ubuntu/UbuntuGestures/touchownershipevent.h 2016-06-29 09:35:37 +0000
164@@ -20,7 +20,7 @@
165 #include <QEvent>
166 #include "ubuntugesturesglobal.h"
167
168-UG_NAMESPACE_BEGIN
169+namespace UbuntuGestures {
170 /*
171 When an item get an ownership event for a touch it can grab/steal that touch
172 with a clean conscience.
173
174=== modified file 'src/Ubuntu/UbuntuGestures/touchregistry.h'
175--- src/Ubuntu/UbuntuGestures/touchregistry.h 2016-06-21 14:21:46 +0000
176+++ src/Ubuntu/UbuntuGestures/touchregistry.h 2016-06-29 09:35:37 +0000
177@@ -92,7 +92,7 @@
178 [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)
179 */
180
181-UG_NAMESPACE_BEGIN
182+namespace UbuntuGestures {
183
184 class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject
185 {
186
187=== modified file 'src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h'
188--- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h 2016-06-21 14:21:46 +0000
189+++ src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h 2016-06-29 09:35:37 +0000
190@@ -21,7 +21,7 @@
191
192 #include <ubuntugesturesglobal.h>
193
194-UG_NAMESPACE_BEGIN
195+namespace UbuntuGestures {
196
197 class UBUNTUGESTURES_EXPORT UbuntuGesturesModule
198 {
199
200=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea.cpp'
201--- src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-06-21 14:21:46 +0000
202+++ src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-06-29 09:35:37 +0000
203@@ -128,7 +128,7 @@
204 };
205 /*!
206 * \qmltype SwipeArea
207- * \instantiates UCSwipeArea
208+ * \instantiates UbuntuGestures::UCSwipeArea
209 * \inherits Item
210 * \inqmlmodule Ubuntu.Components
211 * \since Ubuntu.Components 1.3
212
213=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea_p.h'
214--- src/Ubuntu/UbuntuGestures/ucswipearea_p.h 2016-06-21 14:21:46 +0000
215+++ src/Ubuntu/UbuntuGestures/ucswipearea_p.h 2016-06-29 09:35:37 +0000
216@@ -28,7 +28,7 @@
217 // logging
218 #include <QtCore/QLoggingCategory>
219
220-UG_NAMESPACE_BEGIN
221+namespace UbuntuGestures {
222
223 class TouchOwnershipEvent;
224 class UnownedTouchEvent;
225
226=== modified file 'src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h'
227--- src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h 2016-06-21 14:21:46 +0000
228+++ src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h 2016-06-29 09:35:37 +0000
229@@ -23,7 +23,7 @@
230
231 #include "damper_p.h"
232
233-UG_NAMESPACE_BEGIN
234+namespace UbuntuGestures {
235
236 // Information about an active touch point
237 struct UBUNTUGESTURES_EXPORT ActiveTouchInfo {
238
239=== modified file 'src/Ubuntu/UbuntuGestures/unownedtouchevent.h'
240--- src/Ubuntu/UbuntuGestures/unownedtouchevent.h 2016-06-21 14:21:46 +0000
241+++ src/Ubuntu/UbuntuGestures/unownedtouchevent.h 2016-06-29 09:35:37 +0000
242@@ -21,7 +21,7 @@
243 #include <QScopedPointer>
244 #include "ubuntugesturesglobal.h"
245
246-UG_NAMESPACE_BEGIN
247+namespace UbuntuGestures {
248 /*
249 A touch event with touch points that do not belong the item receiving it.
250
251
252=== modified file 'src/Ubuntu/UbuntuToolkit/alarmmanager_p.h'
253--- src/Ubuntu/UbuntuToolkit/alarmmanager_p.h 2016-06-17 11:26:12 +0000
254+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p.h 2016-06-29 09:35:37 +0000
255@@ -25,7 +25,7 @@
256
257 #include "ucalarm.h"
258
259-UT_NAMESPACE_BEGIN
260+namespace UbuntuToolkit {
261
262 class AlarmUtils {
263 public:
264
265=== modified file 'src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h'
266--- src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h 2016-06-17 11:26:12 +0000
267+++ src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h 2016-06-29 09:35:37 +0000
268@@ -24,7 +24,7 @@
269 #include "alarmmanager_p.h"
270 #include <QtCore/QUrl>
271
272-UT_NAMESPACE_BEGIN
273+namespace UbuntuToolkit {
274
275 class UBUNTUTOOLKIT_EXPORT AlarmManagerPrivate
276 {
277
278=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader.h'
279--- src/Ubuntu/UbuntuToolkit/asyncloader.h 2016-06-17 11:26:12 +0000
280+++ src/Ubuntu/UbuntuToolkit/asyncloader.h 2016-06-29 09:35:37 +0000
281@@ -25,7 +25,7 @@
282 class QQuickItem;
283 class QQmlContext;
284
285-UT_NAMESPACE_BEGIN
286+namespace UbuntuToolkit {
287
288 class AsyncLoaderPrivate;
289 class UBUNTUTOOLKIT_EXPORT AsyncLoader : public QObject
290
291=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader_p.h'
292--- src/Ubuntu/UbuntuToolkit/asyncloader_p.h 2016-06-22 13:15:15 +0000
293+++ src/Ubuntu/UbuntuToolkit/asyncloader_p.h 2016-06-29 09:35:37 +0000
294@@ -24,7 +24,7 @@
295 #include <ubuntutoolkitglobal.h>
296 #include <asyncloader.h>
297
298-UT_NAMESPACE_BEGIN
299+namespace UbuntuToolkit {
300
301 class AsyncLoaderPrivate : public QObjectPrivate, public QQmlIncubator
302 {
303
304=== modified file 'src/Ubuntu/UbuntuToolkit/colorutils.h'
305--- src/Ubuntu/UbuntuToolkit/colorutils.h 2016-06-17 11:26:12 +0000
306+++ src/Ubuntu/UbuntuToolkit/colorutils.h 2016-06-29 09:35:37 +0000
307@@ -19,7 +19,7 @@
308 #include <QObject>
309 #include "ubuntutoolkitglobal.h"
310
311-UT_NAMESPACE_BEGIN
312+namespace UbuntuToolkit {
313
314 class UBUNTUTOOLKIT_EXPORT ColorUtils : public QObject
315 {
316
317=== modified file 'src/Ubuntu/UbuntuToolkit/filterbehavior.h'
318--- src/Ubuntu/UbuntuToolkit/filterbehavior.h 2016-06-17 11:26:12 +0000
319+++ src/Ubuntu/UbuntuToolkit/filterbehavior.h 2016-06-29 09:35:37 +0000
320@@ -23,7 +23,7 @@
321 #include <QSortFilterProxyModel>
322 #include <ubuntutoolkitglobal.h>
323
324-UT_NAMESPACE_BEGIN
325+namespace UbuntuToolkit {
326
327 class UBUNTUTOOLKIT_EXPORT FilterBehavior : public QObject {
328 Q_OBJECT
329
330=== modified file 'src/Ubuntu/UbuntuToolkit/i18n.h'
331--- src/Ubuntu/UbuntuToolkit/i18n.h 2016-06-17 11:26:12 +0000
332+++ src/Ubuntu/UbuntuToolkit/i18n.h 2016-06-29 09:35:37 +0000
333@@ -25,7 +25,7 @@
334 class QQmlContext;
335 class QQmlEngine;
336
337-UT_NAMESPACE_BEGIN
338+namespace UbuntuToolkit {
339
340 class UBUNTUTOOLKIT_EXPORT UbuntuI18n : public QObject
341 {
342
343=== modified file 'src/Ubuntu/UbuntuToolkit/inversemouseareatype.h'
344--- src/Ubuntu/UbuntuToolkit/inversemouseareatype.h 2016-06-17 11:26:12 +0000
345+++ src/Ubuntu/UbuntuToolkit/inversemouseareatype.h 2016-06-29 09:35:37 +0000
346@@ -22,7 +22,7 @@
347
348 class QQuickItem;
349
350-UT_NAMESPACE_BEGIN
351+namespace UbuntuToolkit {
352
353 class UBUNTUTOOLKIT_EXPORT InverseMouseAreaType : public QQuickMouseArea
354 {
355
356=== modified file 'src/Ubuntu/UbuntuToolkit/label_p.h'
357--- src/Ubuntu/UbuntuToolkit/label_p.h 2016-06-17 11:26:12 +0000
358+++ src/Ubuntu/UbuntuToolkit/label_p.h 2016-06-29 09:35:37 +0000
359@@ -19,7 +19,7 @@
360
361 #include "uclabel.h"
362
363-UT_NAMESPACE_BEGIN
364+namespace UbuntuToolkit {
365
366 class UCLabelPrivate
367 {
368
369=== modified file 'src/Ubuntu/UbuntuToolkit/listener.h'
370--- src/Ubuntu/UbuntuToolkit/listener.h 2016-06-17 11:26:12 +0000
371+++ src/Ubuntu/UbuntuToolkit/listener.h 2016-06-29 09:35:37 +0000
372@@ -22,7 +22,7 @@
373
374 class QQmlContext;
375
376-UT_NAMESPACE_BEGIN
377+namespace UbuntuToolkit {
378
379 class UBUNTUTOOLKIT_EXPORT ContextPropertyChangeListener : public QObject
380 {
381
382=== modified file 'src/Ubuntu/UbuntuToolkit/livetimer.h'
383--- src/Ubuntu/UbuntuToolkit/livetimer.h 2016-06-17 11:26:12 +0000
384+++ src/Ubuntu/UbuntuToolkit/livetimer.h 2016-06-29 09:35:37 +0000
385@@ -21,7 +21,7 @@
386 #include <QDateTime>
387 #include <ubuntutoolkitglobal.h>
388
389-UT_NAMESPACE_BEGIN
390+namespace UbuntuToolkit {
391
392 class UBUNTUTOOLKIT_EXPORT LiveTimer : public QObject
393 {
394
395=== modified file 'src/Ubuntu/UbuntuToolkit/livetimer_p.h'
396--- src/Ubuntu/UbuntuToolkit/livetimer_p.h 2016-06-17 11:26:12 +0000
397+++ src/Ubuntu/UbuntuToolkit/livetimer_p.h 2016-06-29 09:35:37 +0000
398@@ -21,7 +21,7 @@
399
400 #include <QTimer>
401
402-UT_NAMESPACE_BEGIN
403+namespace UbuntuToolkit {
404
405 class SharedLiveTimer : public QObject
406 {
407
408=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp'
409--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp 2016-06-17 11:26:12 +0000
410+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp 2016-06-29 09:35:37 +0000
411@@ -41,7 +41,7 @@
412
413 /*!
414 * \qmltype MouseTouchAdaptor
415- * \instantiates MouseTouchAdaptor
416+ * \instantiates UbuntuToolkit::MouseTouchAdaptor
417 * \inqmlmodule Ubuntu.Test 1.0
418 * \ingroup ubuntu-test
419 * \brief Singleton type turning mouse events into single finger touch events.
420
421=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h'
422--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h 2016-06-17 11:26:12 +0000
423+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor.h 2016-06-29 09:35:37 +0000
424@@ -29,7 +29,7 @@
425 class QQmlEngine;
426 class QJSEngine;
427
428-UT_NAMESPACE_BEGIN
429+namespace UbuntuToolkit {
430
431 // Transforms QMouseEvents into single-finger QTouchEvents.
432 class MouseTouchAdaptorPrivate;
433
434=== modified file 'src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h'
435--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h 2016-06-17 11:26:12 +0000
436+++ src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h 2016-06-29 09:35:37 +0000
437@@ -25,7 +25,7 @@
438 #include <QWindow>
439 #include <xcb/xcb.h>
440
441-UT_NAMESPACE_BEGIN
442+namespace UbuntuToolkit {
443
444 class MouseTouchAdaptorPrivate : public QObjectPrivate, public QAbstractNativeEventFilter
445 {
446
447=== modified file 'src/Ubuntu/UbuntuToolkit/propertychange.h'
448--- src/Ubuntu/UbuntuToolkit/propertychange.h 2016-06-17 11:26:12 +0000
449+++ src/Ubuntu/UbuntuToolkit/propertychange.h 2016-06-29 09:35:37 +0000
450@@ -28,7 +28,7 @@
451
452 class QQmlAbstractBinding;
453
454-UT_NAMESPACE_BEGIN
455+namespace UbuntuToolkit {
456
457 class UBUNTUTOOLKIT_EXPORT PropertyChange
458 {
459
460=== modified file 'src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp'
461--- src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp 2016-06-17 11:26:12 +0000
462+++ src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp 2016-06-29 09:35:37 +0000
463@@ -27,7 +27,7 @@
464
465 /*!
466 * \qmltype Clipboard
467- * \instantiates QQuickClipboard
468+ * \instantiates UbuntuToolkit::QQuickClipboard
469 * \inqmlmodule Ubuntu.Components
470 * \ingroup ubuntu
471 * \brief This is a singleton type providing access to the system clipboard.
472
473=== modified file 'src/Ubuntu/UbuntuToolkit/qquickclipboard.h'
474--- src/Ubuntu/UbuntuToolkit/qquickclipboard.h 2016-06-21 13:16:07 +0000
475+++ src/Ubuntu/UbuntuToolkit/qquickclipboard.h 2016-06-29 09:35:37 +0000
476@@ -27,7 +27,7 @@
477 class QQmlEngine;
478 class QJSEngine;
479
480-UT_NAMESPACE_BEGIN
481+namespace UbuntuToolkit {
482
483 class QQuickMimeData;
484 class QQuickClipboardPrivate;
485
486=== modified file 'src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h'
487--- src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h 2016-06-17 11:26:12 +0000
488+++ src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h 2016-06-29 09:35:37 +0000
489@@ -22,7 +22,7 @@
490 #include "qquickclipboard.h"
491 #include <QtGui/QClipboard>
492
493-UT_NAMESPACE_BEGIN
494+namespace UbuntuToolkit {
495
496 class QQuickMimeData;
497 class QQuickClipboardPrivate {
498
499=== modified file 'src/Ubuntu/UbuntuToolkit/qquickmimedata.h'
500--- src/Ubuntu/UbuntuToolkit/qquickmimedata.h 2016-06-17 11:26:12 +0000
501+++ src/Ubuntu/UbuntuToolkit/qquickmimedata.h 2016-06-29 09:35:37 +0000
502@@ -25,7 +25,7 @@
503 #include <QtCore/QUrl>
504 #include "qquickclipboard.h"
505
506-UT_NAMESPACE_BEGIN
507+namespace UbuntuToolkit {
508
509 class UBUNTUTOOLKIT_EXPORT QQuickMimeData : public QObject
510 {
511
512=== modified file 'src/Ubuntu/UbuntuToolkit/quickutils.h'
513--- src/Ubuntu/UbuntuToolkit/quickutils.h 2016-06-17 11:26:12 +0000
514+++ src/Ubuntu/UbuntuToolkit/quickutils.h 2016-06-29 09:35:37 +0000
515@@ -27,7 +27,7 @@
516 class QQmlEngine;
517 class QQmlComponent;
518
519-UT_NAMESPACE_BEGIN
520+namespace UbuntuToolkit {
521
522 class UBUNTUTOOLKIT_EXPORT QuickUtils : public QObject
523 {
524
525=== modified file 'src/Ubuntu/UbuntuToolkit/sortbehavior.h'
526--- src/Ubuntu/UbuntuToolkit/sortbehavior.h 2016-06-17 11:26:12 +0000
527+++ src/Ubuntu/UbuntuToolkit/sortbehavior.h 2016-06-29 09:35:37 +0000
528@@ -23,7 +23,7 @@
529 #include <QSortFilterProxyModel>
530 #include <ubuntutoolkitglobal.h>
531
532-UT_NAMESPACE_BEGIN
533+namespace UbuntuToolkit {
534
535 class UBUNTUTOOLKIT_EXPORT SortBehavior : public QObject {
536 Q_OBJECT
537
538=== modified file 'src/Ubuntu/UbuntuToolkit/sortfiltermodel.h'
539--- src/Ubuntu/UbuntuToolkit/sortfiltermodel.h 2016-06-17 15:23:34 +0000
540+++ src/Ubuntu/UbuntuToolkit/sortfiltermodel.h 2016-06-29 09:35:37 +0000
541@@ -25,7 +25,7 @@
542 #include "sortbehavior.h"
543 #include "filterbehavior.h"
544
545-UT_NAMESPACE_BEGIN
546+namespace UbuntuToolkit {
547
548 class Q_DECL_EXPORT QSortFilterProxyModelQML : public QSortFilterProxyModel
549 {
550@@ -33,8 +33,13 @@
551
552 Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel NOTIFY modelChanged)
553 Q_PROPERTY(int count READ count NOTIFY countChanged)
554+#ifndef Q_QDOC
555 Q_PROPERTY(UT_PREPEND_NAMESPACE(SortBehavior)* sort READ sortBehavior NOTIFY sortChanged)
556 Q_PROPERTY(UT_PREPEND_NAMESPACE(FilterBehavior)* filter READ filterBehavior NOTIFY filterChanged)
557+#else
558+ Q_PROPERTY(SortBehavior* sort READ sortBehavior NOTIFY sortChanged)
559+ Q_PROPERTY(FilterBehavior* filter READ filterBehavior NOTIFY filterChanged)
560+#endif
561
562 public:
563 explicit QSortFilterProxyModelQML(QObject *parent = 0);
564
565=== modified file 'src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h'
566--- src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h 2016-06-17 11:26:12 +0000
567+++ src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h 2016-06-29 09:35:37 +0000
568@@ -27,7 +27,7 @@
569 #include <QtCore/QStack>
570 #include <ubuntutoolkitglobal.h>
571
572-UT_NAMESPACE_BEGIN
573+namespace UbuntuToolkit {
574
575 class UBUNTUTOOLKIT_EXPORT StateSaverBackend : public QObject
576 {
577
578=== modified file 'src/Ubuntu/UbuntuToolkit/timeutils_p.h'
579--- src/Ubuntu/UbuntuToolkit/timeutils_p.h 2016-06-17 11:26:12 +0000
580+++ src/Ubuntu/UbuntuToolkit/timeutils_p.h 2016-06-29 09:35:37 +0000
581@@ -24,7 +24,7 @@
582 #include <QObject>
583 #include <QTimer>
584
585-UT_NAMESPACE_BEGIN
586+namespace UbuntuToolkit {
587
588 /* Check the system locale setting to see if the format is 24-hour
589 time or 12-hour time */
590
591=== modified file 'src/Ubuntu/UbuntuToolkit/tree.h'
592--- src/Ubuntu/UbuntuToolkit/tree.h 2016-06-17 11:26:12 +0000
593+++ src/Ubuntu/UbuntuToolkit/tree.h 2016-06-29 09:35:37 +0000
594@@ -21,7 +21,7 @@
595 #include <QVariant>
596 #include "ubuntutoolkitglobal.h"
597
598-UT_NAMESPACE_BEGIN
599+namespace UbuntuToolkit {
600
601 class TreePrivate;
602 class UBUNTUTOOLKIT_EXPORT Tree : public QObject
603
604=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h'
605--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h 2016-06-23 13:37:24 +0000
606+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h 2016-06-29 09:35:37 +0000
607@@ -44,7 +44,7 @@
608 return qmlRegisterSingletonType<T>(uri, major, minor, typeName, qmlRegisterSimpleSingletonTypeCallback<T>);
609 }
610
611-UT_NAMESPACE_BEGIN
612+namespace UbuntuToolkit {
613
614 class UBUNTUTOOLKIT_EXPORT UbuntuToolkitModule : public QObject
615 {
616
617=== modified file 'src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp'
618--- src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp 2016-06-17 15:55:58 +0000
619+++ src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp 2016-06-29 09:35:37 +0000
620@@ -46,7 +46,7 @@
621
622 /*!
623 \qmltype AbstractButton
624- \instantiates UCAbstractButton
625+ \instantiates UbuntuToolkit::UCAbstractButton
626 \inherits ActionItem
627 \inqmlmodule Ubuntu.Components
628 \ingroup ubuntu
629
630=== modified file 'src/Ubuntu/UbuntuToolkit/ucabstractbutton.h'
631--- src/Ubuntu/UbuntuToolkit/ucabstractbutton.h 2016-06-21 13:16:07 +0000
632+++ src/Ubuntu/UbuntuToolkit/ucabstractbutton.h 2016-06-29 09:35:37 +0000
633@@ -24,7 +24,7 @@
634 class QQuickMouseArea;
635 class QQuickMouseEvent;
636
637-UT_NAMESPACE_BEGIN
638+namespace UbuntuToolkit {
639
640 class UCAbstractButtonPrivate;
641 class UBUNTUTOOLKIT_EXPORT UCAbstractButton : public UCActionItem
642
643=== modified file 'src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h'
644--- src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h 2016-06-17 11:26:12 +0000
645+++ src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h 2016-06-29 09:35:37 +0000
646@@ -20,7 +20,7 @@
647 #include "ucabstractbutton.h"
648 #include "ucactionitem_p.h"
649
650-UT_NAMESPACE_BEGIN
651+namespace UbuntuToolkit {
652
653 class UCAbstractButtonPrivate : public UCActionItemPrivate
654 {
655
656=== modified file 'src/Ubuntu/UbuntuToolkit/ucaction.cpp'
657--- src/Ubuntu/UbuntuToolkit/ucaction.cpp 2016-06-17 11:26:12 +0000
658+++ src/Ubuntu/UbuntuToolkit/ucaction.cpp 2016-06-29 09:35:37 +0000
659@@ -85,7 +85,7 @@
660
661 /*!
662 * \qmltype Action
663- * \instantiates UCAction
664+ * \instantiates UbuntuToolkit::UCAction
665 * \inqmlmodule Ubuntu.Components
666 * \ingroup ubuntu
667 * \brief Describe an action that can be re-used and shared between different
668
669=== modified file 'src/Ubuntu/UbuntuToolkit/ucaction.h'
670--- src/Ubuntu/UbuntuToolkit/ucaction.h 2016-06-17 11:26:12 +0000
671+++ src/Ubuntu/UbuntuToolkit/ucaction.h 2016-06-29 09:35:37 +0000
672@@ -29,7 +29,7 @@
673 class QQmlComponent;
674 class QQuickItem;
675
676-UT_NAMESPACE_BEGIN
677+namespace UbuntuToolkit {
678
679 // the function detects whether QML has an overridden trigger() slot available
680 // and invokes the one with the appropriate signature
681
682=== modified file 'src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp'
683--- src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp 2016-06-17 11:26:12 +0000
684+++ src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp 2016-06-29 09:35:37 +0000
685@@ -34,7 +34,7 @@
686
687 /*!
688 * \qmltype ActionContext
689- * \instantiates UCActionContext
690+ * \instantiates UbuntuToolkit::UCActionContext
691 * \inqmlmodule Ubuntu.Components
692 * \ingroup ubuntu
693 * \brief ActionContext groups actions together and by providing multiple contexts
694@@ -257,7 +257,7 @@
695
696 /*!
697 * \qmltype PopupContext
698- * \instantiates UCPopupContext
699+ * \instantiates UbuntuToolkit::UCPopupContext
700 * \inqmlmodule Ubuntu.Components
701 * \since Ubuntu.Components 1.3
702 * \inherits ActionContext
703
704=== modified file 'src/Ubuntu/UbuntuToolkit/ucactioncontext.h'
705--- src/Ubuntu/UbuntuToolkit/ucactioncontext.h 2016-06-17 15:23:34 +0000
706+++ src/Ubuntu/UbuntuToolkit/ucactioncontext.h 2016-06-29 09:35:37 +0000
707@@ -26,7 +26,7 @@
708
709 class QQuickItem;
710
711-UT_NAMESPACE_BEGIN
712+namespace UbuntuToolkit {
713
714 class UCAction;
715 class UCActionContextAttached;
716
717=== modified file 'src/Ubuntu/UbuntuToolkit/ucactionitem.cpp'
718--- src/Ubuntu/UbuntuToolkit/ucactionitem.cpp 2016-06-17 11:26:12 +0000
719+++ src/Ubuntu/UbuntuToolkit/ucactionitem.cpp 2016-06-29 09:35:37 +0000
720@@ -39,7 +39,7 @@
721
722 /*!
723 * \qmltype ActionItem
724- * \instantiates UCActionItem
725+ * \instantiates UbuntuToolkit::UCActionItem
726 * \inqmlmodule Ubuntu.Components
727 * \ingroup ubuntu
728 * \brief A visual representation of an Action. The API of ActionItem is a
729
730=== modified file 'src/Ubuntu/UbuntuToolkit/ucactionitem.h'
731--- src/Ubuntu/UbuntuToolkit/ucactionitem.h 2016-06-21 13:16:07 +0000
732+++ src/Ubuntu/UbuntuToolkit/ucactionitem.h 2016-06-29 09:35:37 +0000
733@@ -18,7 +18,7 @@
734
735 #include "ucstyleditembase.h"
736
737-UT_NAMESPACE_BEGIN
738+namespace UbuntuToolkit {
739
740 class UCAction;
741 class UCActionItemPrivate;
742
743=== modified file 'src/Ubuntu/UbuntuToolkit/ucactionitem_p.h'
744--- src/Ubuntu/UbuntuToolkit/ucactionitem_p.h 2016-06-17 11:26:12 +0000
745+++ src/Ubuntu/UbuntuToolkit/ucactionitem_p.h 2016-06-29 09:35:37 +0000
746@@ -22,7 +22,7 @@
747 #include "ucactionitem.h"
748 #include "ucstyleditembase_p.h"
749
750-UT_NAMESPACE_BEGIN
751+namespace UbuntuToolkit {
752
753 class UCActionItemPrivate : public UCStyledItemBasePrivate
754 {
755
756=== modified file 'src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp'
757--- src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp 2016-06-17 11:26:12 +0000
758+++ src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp 2016-06-29 09:35:37 +0000
759@@ -23,7 +23,7 @@
760
761 /*!
762 * \qmltype ActionManager
763- * \instantiates UCActionManager
764+ * \instantiates UbuntuToolkit::UCActionManager
765 * \inqmlmodule Ubuntu.Components
766 * \ingroup ubuntu
767 * \brief ActionManager manages actions and action contexts withion an application.
768
769=== modified file 'src/Ubuntu/UbuntuToolkit/ucactionmanager.h'
770--- src/Ubuntu/UbuntuToolkit/ucactionmanager.h 2016-06-17 15:23:34 +0000
771+++ src/Ubuntu/UbuntuToolkit/ucactionmanager.h 2016-06-29 09:35:37 +0000
772@@ -22,7 +22,7 @@
773 #include <QtQml/QQmlParserStatus>
774 #include "ubuntutoolkitglobal.h"
775
776-UT_NAMESPACE_BEGIN
777+namespace UbuntuToolkit {
778
779 class UCAction;
780 class UCActionContext;
781
782=== modified file 'src/Ubuntu/UbuntuToolkit/ucalarm.cpp'
783--- src/Ubuntu/UbuntuToolkit/ucalarm.cpp 2016-06-17 11:26:12 +0000
784+++ src/Ubuntu/UbuntuToolkit/ucalarm.cpp 2016-06-29 09:35:37 +0000
785@@ -208,7 +208,7 @@
786
787 /*!
788 * \qmltype Alarm
789- * \instantiates UCAlarm
790+ * \instantiates UbuntuToolkit::UCAlarm
791 * \inqmlmodule Ubuntu.Components
792 * \ingroup ubuntu-services
793 * \brief Alarm component is a representation of an alarm event.
794
795=== modified file 'src/Ubuntu/UbuntuToolkit/ucalarm.h'
796--- src/Ubuntu/UbuntuToolkit/ucalarm.h 2016-06-17 11:26:12 +0000
797+++ src/Ubuntu/UbuntuToolkit/ucalarm.h 2016-06-29 09:35:37 +0000
798@@ -24,7 +24,7 @@
799 #include <QtCore/QUrl>
800 #include "ubuntutoolkitglobal.h"
801
802-UT_NAMESPACE_BEGIN
803+namespace UbuntuToolkit {
804
805 class UCAlarmPrivate;
806 class UBUNTUTOOLKIT_EXPORT UCAlarm : public QObject
807
808=== modified file 'src/Ubuntu/UbuntuToolkit/ucalarm_p.h'
809--- src/Ubuntu/UbuntuToolkit/ucalarm_p.h 2016-06-17 11:26:12 +0000
810+++ src/Ubuntu/UbuntuToolkit/ucalarm_p.h 2016-06-29 09:35:37 +0000
811@@ -25,7 +25,7 @@
812 #include <QtCore/QPointer>
813 #include <QtQml/QQmlListProperty>
814
815-UT_NAMESPACE_BEGIN
816+namespace UbuntuToolkit {
817
818 class UBUNTUTOOLKIT_EXPORT UCAlarmPrivate
819 {
820
821=== modified file 'src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp'
822--- src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp 2016-06-17 11:26:12 +0000
823+++ src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp 2016-06-29 09:35:37 +0000
824@@ -28,7 +28,7 @@
825
826 /*!
827 * \qmltype AlarmModel
828- * \instantiates UCAlarmModel
829+ * \instantiates UbuntuToolkit::UCAlarmModel
830 * \inqmlmodule Ubuntu.Components
831 * \ingroup ubuntu-services
832 * \brief AlarmModel holds the list of alarms defined.
833
834=== modified file 'src/Ubuntu/UbuntuToolkit/ucalarmmodel.h'
835--- src/Ubuntu/UbuntuToolkit/ucalarmmodel.h 2016-06-17 15:23:34 +0000
836+++ src/Ubuntu/UbuntuToolkit/ucalarmmodel.h 2016-06-29 09:35:37 +0000
837@@ -23,7 +23,7 @@
838 #include <QtQml/QQmlParserStatus>
839 #include "ucalarm.h"
840
841-UT_NAMESPACE_BEGIN
842+namespace UbuntuToolkit {
843
844 class UCAlarm;
845 class UBUNTUTOOLKIT_EXPORT UCAlarmModel : public QAbstractListModel, public QQmlParserStatus
846
847=== modified file 'src/Ubuntu/UbuntuToolkit/ucapplication.h'
848--- src/Ubuntu/UbuntuToolkit/ucapplication.h 2016-06-17 11:26:12 +0000
849+++ src/Ubuntu/UbuntuToolkit/ucapplication.h 2016-06-29 09:35:37 +0000
850@@ -25,7 +25,7 @@
851 class QQmlContext;
852 class QQmlEngine;
853
854-UT_NAMESPACE_BEGIN
855+namespace UbuntuToolkit {
856
857 class UBUNTUTOOLKIT_EXPORT UCApplication : public QObject
858 {
859
860=== modified file 'src/Ubuntu/UbuntuToolkit/ucargument.h'
861--- src/Ubuntu/UbuntuToolkit/ucargument.h 2016-06-17 11:26:12 +0000
862+++ src/Ubuntu/UbuntuToolkit/ucargument.h 2016-06-29 09:35:37 +0000
863@@ -24,7 +24,7 @@
864 #include <QtCore/QVariant>
865 #include "ubuntutoolkitglobal.h"
866
867-UT_NAMESPACE_BEGIN
868+namespace UbuntuToolkit {
869
870 class UBUNTUTOOLKIT_EXPORT UCArgument : public QObject
871 {
872
873=== modified file 'src/Ubuntu/UbuntuToolkit/ucarguments.h'
874--- src/Ubuntu/UbuntuToolkit/ucarguments.h 2016-06-17 15:23:34 +0000
875+++ src/Ubuntu/UbuntuToolkit/ucarguments.h 2016-06-29 09:35:37 +0000
876@@ -28,7 +28,7 @@
877 #include <QtQml/QQmlListProperty>
878 #include <QtQml/QQmlParserStatus>
879
880-UT_NAMESPACE_BEGIN
881+namespace UbuntuToolkit {
882
883 class UBUNTUTOOLKIT_EXPORT UCArguments : public QObject, public QQmlParserStatus
884 {
885
886=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp'
887--- src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp 2016-06-17 11:26:12 +0000
888+++ src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp 2016-06-29 09:35:37 +0000
889@@ -494,7 +494,7 @@
890
891 /*!
892 * \qmltype BottomEdge
893- * \instantiates UCBottomEdge
894+ * \instantiates UbuntuToolkit::UCBottomEdge
895 * \inqmlmodule Ubuntu.Components
896 * \inherits StyledItem
897 * \ingroup ubuntu
898
899=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedge.h'
900--- src/Ubuntu/UbuntuToolkit/ucbottomedge.h 2016-06-20 16:12:36 +0000
901+++ src/Ubuntu/UbuntuToolkit/ucbottomedge.h 2016-06-29 09:35:37 +0000
902@@ -26,7 +26,7 @@
903
904 class QQuickAbstractAnimation;
905
906-UT_NAMESPACE_BEGIN
907+namespace UbuntuToolkit {
908
909 class UCBottomEdgeHint;
910 class UCBottomEdgeRegion;
911
912=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h'
913--- src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h 2016-06-22 13:15:15 +0000
914+++ src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h 2016-06-29 09:35:37 +0000
915@@ -23,7 +23,7 @@
916 #include "ucstyleditembase_p.h"
917 #include "ucaction.h"
918
919-UT_NAMESPACE_BEGIN
920+namespace UbuntuToolkit {
921
922 class UCBottomEdgeStyle;
923 class UBUNTUTOOLKIT_EXPORT UCBottomEdgePrivate : public UCStyledItemBasePrivate, protected QQuickItemChangeListener
924
925=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgehint.h'
926--- src/Ubuntu/UbuntuToolkit/ucbottomedgehint.h 2016-06-21 14:21:46 +0000
927+++ src/Ubuntu/UbuntuToolkit/ucbottomedgehint.h 2016-06-29 09:35:37 +0000
928@@ -25,7 +25,7 @@
929 class QQuickFlickable;
930 UG_FORWARD_DECLARE_CLASS(UCSwipeArea)
931
932-UT_NAMESPACE_BEGIN
933+namespace UbuntuToolkit {
934
935 class PropertyChange;
936 class UCBottomEdgeHintPrivate;
937
938=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h'
939--- src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h 2016-06-22 13:15:15 +0000
940+++ src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h 2016-06-29 09:35:37 +0000
941@@ -25,7 +25,7 @@
942
943 UG_FORWARD_DECLARE_CLASS(UCSwipeArea)
944
945-UT_NAMESPACE_BEGIN
946+namespace UbuntuToolkit {
947
948 class PropertyChange;
949 class UCBottomEdgeHintPrivate : public UCActionItemPrivate
950
951=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp'
952--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp 2016-06-22 13:15:15 +0000
953+++ src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp 2016-06-29 09:35:37 +0000
954@@ -48,7 +48,7 @@
955
956 /*!
957 * \qmltype BottomEdgeRegion
958- * \instantiates UCBottomEdgeRegion
959+ * \instantiates UbuntuToolkit::UCBottomEdgeRegion
960 * \inherits QtObject
961 * \inmodule Ubuntu.Components 1.3
962 * \since Ubuntu.Components 1.3
963
964=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.h'
965--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.h 2016-06-22 13:15:15 +0000
966+++ src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.h 2016-06-29 09:35:37 +0000
967@@ -28,7 +28,7 @@
968
969 class QQmlComponent;
970
971-UT_NAMESPACE_BEGIN
972+namespace UbuntuToolkit {
973
974 class UCBottomEdge;
975 class PropertyChange;
976
977=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h'
978--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h 2016-06-22 13:15:15 +0000
979+++ src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h 2016-06-29 09:35:37 +0000
980@@ -23,7 +23,7 @@
981 #include <asyncloader.h>
982 #include <QtCore/private/qobject_p.h>
983
984-UT_NAMESPACE_BEGIN
985+namespace UbuntuToolkit {
986
987 class UBUNTUTOOLKIT_EXPORT UCBottomEdgeRegionPrivate : public QObjectPrivate
988 {
989
990=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp'
991--- src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp 2016-06-17 11:26:12 +0000
992+++ src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp 2016-06-29 09:35:37 +0000
993@@ -23,7 +23,7 @@
994
995 /*!
996 * \qmltype BottomEdgeStyle
997- * \instantiates UCBottomEdgeStyle
998+ * \instantiates UbuntuToolkit::UCBottomEdgeStyle
999 * \inqmlmodule Ubuntu.Components.Styles 1.3
1000 * \since Ubuntu.Components.Styles 1.3
1001 * \ingroup style-api
1002
1003=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.h'
1004--- src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.h 2016-06-17 11:26:12 +0000
1005+++ src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.h 2016-06-29 09:35:37 +0000
1006@@ -25,7 +25,7 @@
1007 class QQuickItem;
1008 class QQuickAbstractAnimation;
1009
1010-UT_NAMESPACE_BEGIN
1011+namespace UbuntuToolkit {
1012
1013 class UCBottomEdge;
1014 class UBUNTUTOOLKIT_EXPORT UCBottomEdgeStyle : public QQuickItem
1015
1016=== modified file 'src/Ubuntu/UbuntuToolkit/ucdefaulttheme.h'
1017--- src/Ubuntu/UbuntuToolkit/ucdefaulttheme.h 2016-06-17 11:26:12 +0000
1018+++ src/Ubuntu/UbuntuToolkit/ucdefaulttheme.h 2016-06-29 09:35:37 +0000
1019@@ -25,7 +25,7 @@
1020 #include <QtCore/QObject>
1021 #include <ubuntutoolkitglobal.h>
1022
1023-UT_NAMESPACE_BEGIN
1024+namespace UbuntuToolkit {
1025
1026 class UBUNTUTOOLKIT_EXPORT UCDefaultTheme : public QObject
1027 {
1028
1029=== modified file 'src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.cpp'
1030--- src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.cpp 2016-06-17 11:26:12 +0000
1031+++ src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.cpp 2016-06-29 09:35:37 +0000
1032@@ -29,7 +29,7 @@
1033
1034 /*!
1035 \qmltype Theme
1036- \instantiates UCTheme
1037+ \instantiates UbuntuToolkit::UCTheme
1038 \inqmlmodule Ubuntu.Components
1039 \ingroup theming
1040 \brief The Theme class provides facilities to interact with the current theme.
1041
1042=== modified file 'src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.h'
1043--- src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.h 2016-06-17 11:26:12 +0000
1044+++ src/Ubuntu/UbuntuToolkit/ucdeprecatedtheme.h 2016-06-29 09:35:37 +0000
1045@@ -27,7 +27,7 @@
1046 class QQmlContext;
1047 class QQmlEngine;
1048
1049-UT_NAMESPACE_BEGIN
1050+namespace UbuntuToolkit {
1051
1052 class UCTheme;
1053 class UBUNTUTOOLKIT_EXPORT UCDeprecatedTheme : public QObject
1054
1055=== modified file 'src/Ubuntu/UbuntuToolkit/ucfontutils.cpp'
1056--- src/Ubuntu/UbuntuToolkit/ucfontutils.cpp 2016-06-17 11:26:12 +0000
1057+++ src/Ubuntu/UbuntuToolkit/ucfontutils.cpp 2016-06-29 09:35:37 +0000
1058@@ -24,7 +24,7 @@
1059
1060 /*!
1061 * \qmltype FontUtils
1062- * \instantiates UCFontUtils
1063+ * \instantiates UbuntuToolkit::UCFontUtils
1064 * \inqmlmodule Ubuntu.Components
1065 * \ingroup ubuntu
1066 * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property},
1067
1068=== modified file 'src/Ubuntu/UbuntuToolkit/ucfontutils.h'
1069--- src/Ubuntu/UbuntuToolkit/ucfontutils.h 2016-06-17 11:26:12 +0000
1070+++ src/Ubuntu/UbuntuToolkit/ucfontutils.h 2016-06-29 09:35:37 +0000
1071@@ -21,7 +21,7 @@
1072 #include <QtCore/QObject>
1073 #include <ubuntutoolkitglobal.h>
1074
1075-UT_NAMESPACE_BEGIN
1076+namespace UbuntuToolkit {
1077
1078 class UCUnits;
1079 class UBUNTUTOOLKIT_EXPORT UCFontUtils : public QObject
1080
1081=== modified file 'src/Ubuntu/UbuntuToolkit/uchaptics.h'
1082--- src/Ubuntu/UbuntuToolkit/uchaptics.h 2016-06-17 11:26:12 +0000
1083+++ src/Ubuntu/UbuntuToolkit/uchaptics.h 2016-06-29 09:35:37 +0000
1084@@ -23,7 +23,7 @@
1085 #include <ubuntutoolkitglobal.h>
1086
1087 class QQmlEngine;
1088-UT_NAMESPACE_BEGIN
1089+namespace UbuntuToolkit {
1090
1091 class UBUNTUTOOLKIT_EXPORT UCHaptics : public QObject
1092 {
1093
1094=== modified file 'src/Ubuntu/UbuntuToolkit/ucheader.cpp'
1095--- src/Ubuntu/UbuntuToolkit/ucheader.cpp 2016-06-17 11:26:12 +0000
1096+++ src/Ubuntu/UbuntuToolkit/ucheader.cpp 2016-06-29 09:35:37 +0000
1097@@ -26,7 +26,7 @@
1098
1099 /*!
1100 \qmltype Header
1101- \instantiates UCHeader
1102+ \instantiates UbuntuToolkit::UCHeader
1103 \inherits StyledItem
1104 \inqmlmodule Ubuntu.Components
1105 \ingroup ubuntu
1106
1107=== modified file 'src/Ubuntu/UbuntuToolkit/ucheader.h'
1108--- src/Ubuntu/UbuntuToolkit/ucheader.h 2016-06-17 11:26:12 +0000
1109+++ src/Ubuntu/UbuntuToolkit/ucheader.h 2016-06-29 09:35:37 +0000
1110@@ -23,7 +23,7 @@
1111 class QQuickFlickable;
1112 class QQuickNumberAnimation;
1113
1114-UT_NAMESPACE_BEGIN
1115+namespace UbuntuToolkit {
1116
1117 class UCUbuntuAnimation;
1118 class UBUNTUTOOLKIT_EXPORT UCHeader : public UCStyledItemBase
1119
1120=== modified file 'src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.h'
1121--- src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.h 2016-06-17 11:26:12 +0000
1122+++ src/Ubuntu/UbuntuToolkit/ucimportversionchecker_p.h 2016-06-29 09:35:37 +0000
1123@@ -22,7 +22,7 @@
1124 #include <QtCore>
1125 #include <ubuntutoolkitglobal.h>
1126
1127-UT_NAMESPACE_BEGIN
1128+namespace UbuntuToolkit {
1129
1130 class UBUNTUTOOLKIT_EXPORT UCImportVersionChecker
1131 {
1132
1133=== modified file 'src/Ubuntu/UbuntuToolkit/ucinversemouse.h'
1134--- src/Ubuntu/UbuntuToolkit/ucinversemouse.h 2016-06-17 11:26:12 +0000
1135+++ src/Ubuntu/UbuntuToolkit/ucinversemouse.h 2016-06-29 09:35:37 +0000
1136@@ -22,7 +22,7 @@
1137 #include <QtQml>
1138 #include <ubuntutoolkitglobal.h>
1139
1140-UT_NAMESPACE_BEGIN
1141+namespace UbuntuToolkit {
1142
1143 class UBUNTUTOOLKIT_EXPORT UCInverseMouse : public UCMouse {
1144 Q_OBJECT
1145
1146=== modified file 'src/Ubuntu/UbuntuToolkit/uclabel.cpp'
1147--- src/Ubuntu/UbuntuToolkit/uclabel.cpp 2016-06-17 11:26:12 +0000
1148+++ src/Ubuntu/UbuntuToolkit/uclabel.cpp 2016-06-29 09:35:37 +0000
1149@@ -69,7 +69,7 @@
1150 /*!
1151 * \qmltype Label
1152 * \qmlabstract
1153- * \instantiates UCLabel
1154+ * \instantiates UbuntuToolkit::UCLabel
1155 * \inherits Text
1156 * \inqmlmodule Ubuntu.Components 1.3
1157 * \ingroup ubuntu
1158
1159=== modified file 'src/Ubuntu/UbuntuToolkit/uclabel.h'
1160--- src/Ubuntu/UbuntuToolkit/uclabel.h 2016-06-17 11:26:12 +0000
1161+++ src/Ubuntu/UbuntuToolkit/uclabel.h 2016-06-29 09:35:37 +0000
1162@@ -23,7 +23,7 @@
1163 #include <functional>
1164 #include <ubuntutoolkitglobal.h>
1165
1166-UT_NAMESPACE_BEGIN
1167+namespace UbuntuToolkit {
1168
1169 class UCLabelPrivate;
1170 class UBUNTUTOOLKIT_EXPORT UCLabel : public QQuickText, public UCThemingExtension
1171
1172=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitem.cpp'
1173--- src/Ubuntu/UbuntuToolkit/uclistitem.cpp 2016-06-22 13:15:15 +0000
1174+++ src/Ubuntu/UbuntuToolkit/uclistitem.cpp 2016-06-29 09:35:37 +0000
1175@@ -518,7 +518,7 @@
1176
1177 /*!
1178 * \qmltype ListItem
1179- * \instantiates UCListItem
1180+ * \instantiates UbuntuToolkit::UCListItem
1181 * \inqmlmodule Ubuntu.Components
1182 * \ingroup ubuntu-listitem
1183 * \since Ubuntu.Components 1.2
1184
1185=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitem.h'
1186--- src/Ubuntu/UbuntuToolkit/uclistitem.h 2016-06-21 13:16:07 +0000
1187+++ src/Ubuntu/UbuntuToolkit/uclistitem.h 2016-06-29 09:35:37 +0000
1188@@ -20,7 +20,7 @@
1189 #include <QtQuick/QQuickItem>
1190 #include "ucstyleditembase.h"
1191
1192-UT_NAMESPACE_BEGIN
1193+namespace UbuntuToolkit {
1194
1195 class UCListItemContent;
1196 class UCListItemDivider;
1197@@ -241,7 +241,7 @@
1198 Q_DECLARE_OPERATORS_FOR_FLAGS(UT_PREPEND_NAMESPACE(UCViewItemsAttached)::ExpansionFlags)
1199 QML_DECLARE_TYPEINFO(UT_PREPEND_NAMESPACE(UCViewItemsAttached), QML_HAS_ATTACHED_PROPERTIES)
1200
1201-UT_NAMESPACE_BEGIN
1202+namespace UbuntuToolkit {
1203
1204 class UBUNTUTOOLKIT_EXPORT UCListItemExpansion : public QObject
1205 {
1206
1207=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitem_p.h'
1208--- src/Ubuntu/UbuntuToolkit/uclistitem_p.h 2016-06-17 11:26:12 +0000
1209+++ src/Ubuntu/UbuntuToolkit/uclistitem_p.h 2016-06-29 09:35:37 +0000
1210@@ -31,7 +31,7 @@
1211
1212 class QQuickFlickable;
1213
1214-UT_NAMESPACE_BEGIN
1215+namespace UbuntuToolkit {
1216
1217 class UCListItemDivider;
1218 class UCListItemActions;
1219
1220=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemactions.cpp'
1221--- src/Ubuntu/UbuntuToolkit/uclistitemactions.cpp 2016-06-17 11:26:12 +0000
1222+++ src/Ubuntu/UbuntuToolkit/uclistitemactions.cpp 2016-06-29 09:35:37 +0000
1223@@ -37,7 +37,7 @@
1224
1225 /*!
1226 * \qmltype ListItemActions
1227- * \instantiates UCListItemActions
1228+ * \instantiates UbuntuToolkit::UCListItemActions
1229 * \inherits QtQObject
1230 * \inqmlmodule Ubuntu.Components
1231 * \since Ubuntu.Components 1.2
1232
1233=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemactions.h'
1234--- src/Ubuntu/UbuntuToolkit/uclistitemactions.h 2016-06-17 15:23:34 +0000
1235+++ src/Ubuntu/UbuntuToolkit/uclistitemactions.h 2016-06-29 09:35:37 +0000
1236@@ -22,7 +22,7 @@
1237
1238 class QQmlComponent;
1239
1240-UT_NAMESPACE_BEGIN
1241+namespace UbuntuToolkit {
1242
1243 class UCAction;
1244 class UCListItemActionsPrivate;
1245
1246=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemactions_p.h'
1247--- src/Ubuntu/UbuntuToolkit/uclistitemactions_p.h 2016-06-17 11:26:12 +0000
1248+++ src/Ubuntu/UbuntuToolkit/uclistitemactions_p.h 2016-06-29 09:35:37 +0000
1249@@ -21,7 +21,7 @@
1250 #include "QtCore/private/qobject_p.h"
1251 #include <QtQml/QQmlListProperty>
1252
1253-UT_NAMESPACE_BEGIN
1254+namespace UbuntuToolkit {
1255
1256 class UCListItem;
1257 class UCListItemActionsPrivate : public QObjectPrivate {
1258
1259=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp'
1260--- src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp 2016-06-17 11:26:12 +0000
1261+++ src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp 2016-06-29 09:35:37 +0000
1262@@ -27,7 +27,7 @@
1263
1264 /*!
1265 \qmltype ListItemLayout
1266- \instantiates UCListItemLayout
1267+ \instantiates UbuntuToolkit::UCListItemLayout
1268 \inqmlmodule Ubuntu.Components
1269 \since Ubuntu.Components 1.3
1270 \inherits SlotsLayout
1271
1272=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemlayout.h'
1273--- src/Ubuntu/UbuntuToolkit/uclistitemlayout.h 2016-06-21 13:16:07 +0000
1274+++ src/Ubuntu/UbuntuToolkit/uclistitemlayout.h 2016-06-29 09:35:37 +0000
1275@@ -20,7 +20,7 @@
1276 #include "ucslotslayout.h"
1277 #include <ubuntutoolkitglobal.h>
1278
1279-UT_NAMESPACE_BEGIN
1280+namespace UbuntuToolkit {
1281
1282 class UCLabel;
1283 class UBUNTUTOOLKIT_EXPORT UCListItemLayout : public UCSlotsLayout
1284
1285=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemstyle.cpp'
1286--- src/Ubuntu/UbuntuToolkit/uclistitemstyle.cpp 2016-06-17 11:26:12 +0000
1287+++ src/Ubuntu/UbuntuToolkit/uclistitemstyle.cpp 2016-06-29 09:35:37 +0000
1288@@ -27,7 +27,7 @@
1289
1290 /*!
1291 * \qmltype ListItemStyle
1292- * \instantiates UCListItemStyle
1293+ * \instantiates UbuntuToolkit::UCListItemStyle
1294 * \inqmlmodule Ubuntu.Components.Styles 1.2
1295 * \ingroup style-api
1296 * \since Ubuntu.Components.Styles 1.2
1297
1298=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitemstyle.h'
1299--- src/Ubuntu/UbuntuToolkit/uclistitemstyle.h 2016-06-17 11:26:12 +0000
1300+++ src/Ubuntu/UbuntuToolkit/uclistitemstyle.h 2016-06-29 09:35:37 +0000
1301@@ -25,7 +25,7 @@
1302 class QQuickBehavior;
1303 class QQuickFlickable;
1304
1305-UT_NAMESPACE_BEGIN
1306+namespace UbuntuToolkit {
1307
1308 class UBUNTUTOOLKIT_EXPORT UCSwipeEvent : public QObject
1309 {
1310
1311=== modified file 'src/Ubuntu/UbuntuToolkit/ucmainviewbase.h'
1312--- src/Ubuntu/UbuntuToolkit/ucmainviewbase.h 2016-06-21 13:16:07 +0000
1313+++ src/Ubuntu/UbuntuToolkit/ucmainviewbase.h 2016-06-29 09:35:37 +0000
1314@@ -19,7 +19,7 @@
1315
1316 #include "ucpagetreenode.h"
1317
1318-UT_NAMESPACE_BEGIN
1319+namespace UbuntuToolkit {
1320
1321 class UCMainViewBasePrivate;
1322 class UCActionManager;
1323
1324=== modified file 'src/Ubuntu/UbuntuToolkit/ucmainviewbase_p.h'
1325--- src/Ubuntu/UbuntuToolkit/ucmainviewbase_p.h 2016-06-17 11:26:12 +0000
1326+++ src/Ubuntu/UbuntuToolkit/ucmainviewbase_p.h 2016-06-29 09:35:37 +0000
1327@@ -20,7 +20,7 @@
1328 #include "ucpagetreenode_p.h"
1329 #include <QQmlProperty>
1330
1331-UT_NAMESPACE_BEGIN
1332+namespace UbuntuToolkit {
1333
1334 class UCMainViewBase;
1335 class UCActionManager;
1336
1337=== modified file 'src/Ubuntu/UbuntuToolkit/ucmargins.h'
1338--- src/Ubuntu/UbuntuToolkit/ucmargins.h 2016-06-17 11:26:12 +0000
1339+++ src/Ubuntu/UbuntuToolkit/ucmargins.h 2016-06-29 09:35:37 +0000
1340@@ -21,7 +21,7 @@
1341 #include <QtQuick/QQuickItem>
1342 #include <ubuntutoolkitglobal.h>
1343
1344-UT_NAMESPACE_BEGIN
1345+namespace UbuntuToolkit {
1346
1347 class UBUNTUTOOLKIT_EXPORT UCMargins : public QObject
1348 {
1349
1350=== modified file 'src/Ubuntu/UbuntuToolkit/ucmathutils.h'
1351--- src/Ubuntu/UbuntuToolkit/ucmathutils.h 2016-06-17 11:26:12 +0000
1352+++ src/Ubuntu/UbuntuToolkit/ucmathutils.h 2016-06-29 09:35:37 +0000
1353@@ -24,7 +24,7 @@
1354 QT_FORWARD_DECLARE_CLASS(QQmlEngine)
1355 QT_FORWARD_DECLARE_CLASS(QJSEngine)
1356
1357-UT_NAMESPACE_BEGIN
1358+namespace UbuntuToolkit {
1359
1360 class UBUNTUTOOLKIT_EXPORT UCMathUtils : public QObject
1361 {
1362
1363=== modified file 'src/Ubuntu/UbuntuToolkit/ucmouse.h'
1364--- src/Ubuntu/UbuntuToolkit/ucmouse.h 2016-06-17 11:26:12 +0000
1365+++ src/Ubuntu/UbuntuToolkit/ucmouse.h 2016-06-29 09:35:37 +0000
1366@@ -25,7 +25,7 @@
1367 #include <QtCore/qbasictimer.h>
1368 #include <ubuntutoolkitglobal.h>
1369
1370-UT_NAMESPACE_BEGIN
1371+namespace UbuntuToolkit {
1372
1373 class UBUNTUTOOLKIT_EXPORT ForwardedEvent : public QEvent {
1374 public:
1375
1376=== modified file 'src/Ubuntu/UbuntuToolkit/ucmousefilters.cpp'
1377--- src/Ubuntu/UbuntuToolkit/ucmousefilters.cpp 2016-06-21 13:39:59 +0000
1378+++ src/Ubuntu/UbuntuToolkit/ucmousefilters.cpp 2016-06-29 09:35:37 +0000
1379@@ -56,7 +56,7 @@
1380
1381 /*!
1382 \qmltype Mouse
1383- \instantiates UCMouse
1384+ \instantiates UbuntuToolkit::UCMouse
1385 \inqmlmodule Ubuntu.Components
1386 \ingroup ubuntu
1387 \brief Attached property filtering mouse events occured inside the owner.
1388
1389=== modified file 'src/Ubuntu/UbuntuToolkit/ucpagetreenode.h'
1390--- src/Ubuntu/UbuntuToolkit/ucpagetreenode.h 2016-06-21 13:16:07 +0000
1391+++ src/Ubuntu/UbuntuToolkit/ucpagetreenode.h 2016-06-29 09:35:37 +0000
1392@@ -18,7 +18,7 @@
1393
1394 #include "ucstyleditembase.h"
1395
1396-UT_NAMESPACE_BEGIN
1397+namespace UbuntuToolkit {
1398
1399 class UCPageTreeNodePrivate;
1400 class UBUNTUTOOLKIT_EXPORT UCPageTreeNode : public UCStyledItemBase
1401
1402=== modified file 'src/Ubuntu/UbuntuToolkit/ucpagetreenode_p.h'
1403--- src/Ubuntu/UbuntuToolkit/ucpagetreenode_p.h 2016-06-17 11:26:12 +0000
1404+++ src/Ubuntu/UbuntuToolkit/ucpagetreenode_p.h 2016-06-29 09:35:37 +0000
1405@@ -18,7 +18,7 @@
1406
1407 #include "ucstyleditembase_p.h"
1408
1409-UT_NAMESPACE_BEGIN
1410+namespace UbuntuToolkit {
1411
1412 class UCPageTreeNode;
1413 class UCPageTreeNodePrivate : public UCStyledItemBasePrivate
1414
1415=== modified file 'src/Ubuntu/UbuntuToolkit/ucperformancemonitor.h'
1416--- src/Ubuntu/UbuntuToolkit/ucperformancemonitor.h 2016-06-17 11:26:12 +0000
1417+++ src/Ubuntu/UbuntuToolkit/ucperformancemonitor.h 2016-06-29 09:35:37 +0000
1418@@ -26,7 +26,7 @@
1419 #include <QtQuick/QQuickWindow>
1420 #include <ubuntutoolkitglobal.h>
1421
1422-UT_NAMESPACE_BEGIN
1423+namespace UbuntuToolkit {
1424
1425 class UBUNTUTOOLKIT_EXPORT UCPerformanceMonitor : public QObject
1426 {
1427
1428=== modified file 'src/Ubuntu/UbuntuToolkit/ucproportionalshape.h'
1429--- src/Ubuntu/UbuntuToolkit/ucproportionalshape.h 2016-06-17 11:26:12 +0000
1430+++ src/Ubuntu/UbuntuToolkit/ucproportionalshape.h 2016-06-29 09:35:37 +0000
1431@@ -21,7 +21,7 @@
1432
1433 #include "ucubuntushape.h"
1434
1435-UT_NAMESPACE_BEGIN
1436+namespace UbuntuToolkit {
1437
1438 class UBUNTUTOOLKIT_EXPORT UCProportionalShape : public UCUbuntuShape
1439 {
1440
1441=== modified file 'src/Ubuntu/UbuntuToolkit/ucqquickimageextension.h'
1442--- src/Ubuntu/UbuntuToolkit/ucqquickimageextension.h 2016-06-17 11:26:12 +0000
1443+++ src/Ubuntu/UbuntuToolkit/ucqquickimageextension.h 2016-06-29 09:35:37 +0000
1444@@ -29,7 +29,7 @@
1445
1446 class QQuickImageBase;
1447
1448-UT_NAMESPACE_BEGIN
1449+namespace UbuntuToolkit {
1450
1451 class UBUNTUTOOLKIT_EXPORT UCQQuickImageExtension : public QObject
1452 {
1453
1454=== modified file 'src/Ubuntu/UbuntuToolkit/ucscalingimageprovider.h'
1455--- src/Ubuntu/UbuntuToolkit/ucscalingimageprovider.h 2016-06-17 11:26:12 +0000
1456+++ src/Ubuntu/UbuntuToolkit/ucscalingimageprovider.h 2016-06-29 09:35:37 +0000
1457@@ -23,7 +23,7 @@
1458 #include <QtGui/QImage>
1459 #include <ubuntutoolkitglobal.h>
1460
1461-UT_NAMESPACE_BEGIN
1462+namespace UbuntuToolkit {
1463
1464 class UBUNTUTOOLKIT_EXPORT UCScalingImageProvider : public QQuickImageProvider
1465 {
1466
1467=== modified file 'src/Ubuntu/UbuntuToolkit/ucserviceproperties.cpp'
1468--- src/Ubuntu/UbuntuToolkit/ucserviceproperties.cpp 2016-06-17 11:26:12 +0000
1469+++ src/Ubuntu/UbuntuToolkit/ucserviceproperties.cpp 2016-06-29 09:35:37 +0000
1470@@ -81,7 +81,7 @@
1471
1472 /*!
1473 * \qmltype ServiceProperties
1474- * \instantiates UCServiceProperties
1475+ * \instantiates UbuntuToolkit::UCServiceProperties
1476 * \inqmlmodule Ubuntu.Components
1477 * \since Ubuntu.Components 1.1
1478 * \ingroup ubuntu-services
1479
1480=== modified file 'src/Ubuntu/UbuntuToolkit/ucserviceproperties.h'
1481--- src/Ubuntu/UbuntuToolkit/ucserviceproperties.h 2016-06-17 11:26:12 +0000
1482+++ src/Ubuntu/UbuntuToolkit/ucserviceproperties.h 2016-06-29 09:35:37 +0000
1483@@ -21,7 +21,7 @@
1484 #include <QtQml/QQmlParserStatus>
1485 #include <ubuntutoolkitglobal.h>
1486
1487-UT_NAMESPACE_BEGIN
1488+namespace UbuntuToolkit {
1489
1490 class UCServicePropertiesPrivate;
1491 class UBUNTUTOOLKIT_EXPORT UCServiceProperties : public QObject, public QQmlParserStatus
1492
1493=== modified file 'src/Ubuntu/UbuntuToolkit/ucserviceproperties_p.h'
1494--- src/Ubuntu/UbuntuToolkit/ucserviceproperties_p.h 2016-06-17 11:26:12 +0000
1495+++ src/Ubuntu/UbuntuToolkit/ucserviceproperties_p.h 2016-06-29 09:35:37 +0000
1496@@ -20,7 +20,7 @@
1497 #include "ucserviceproperties.h"
1498 #include <QtCore/QStringList>
1499
1500-UT_NAMESPACE_BEGIN
1501+namespace UbuntuToolkit {
1502
1503 class UBUNTUTOOLKIT_EXPORT UCServicePropertiesPrivate
1504 {
1505
1506=== modified file 'src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp'
1507--- src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp 2016-06-17 11:26:12 +0000
1508+++ src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp 2016-06-29 09:35:37 +0000
1509@@ -598,7 +598,7 @@
1510
1511 /*!
1512 \qmltype SlotsLayout
1513- \instantiates UCSlotsLayout
1514+ \instantiates UbuntuToolkit::UCSlotsLayout
1515 \inqmlmodule Ubuntu.Components
1516 \ingroup ubuntu-slotslayout
1517 \inherits Item
1518
1519=== modified file 'src/Ubuntu/UbuntuToolkit/ucslotslayout.h'
1520--- src/Ubuntu/UbuntuToolkit/ucslotslayout.h 2016-06-21 13:16:07 +0000
1521+++ src/Ubuntu/UbuntuToolkit/ucslotslayout.h 2016-06-29 09:35:37 +0000
1522@@ -22,7 +22,7 @@
1523 #include <QtQuick/QQuickItem>
1524 #include <ubuntutoolkitglobal.h>
1525
1526-UT_NAMESPACE_BEGIN
1527+namespace UbuntuToolkit {
1528
1529 class UCSlotsAttached;
1530 class UCSlotsLayoutPadding;
1531@@ -82,7 +82,7 @@
1532
1533 QML_DECLARE_TYPEINFO(UT_PREPEND_NAMESPACE(UCSlotsLayout), QML_HAS_ATTACHED_PROPERTIES)
1534
1535-UT_NAMESPACE_BEGIN
1536+namespace UbuntuToolkit {
1537
1538 class UCSlotsAttachedPrivate;
1539 class UBUNTUTOOLKIT_EXPORT UCSlotsAttached : public QObject
1540
1541=== modified file 'src/Ubuntu/UbuntuToolkit/ucslotslayout_p.h'
1542--- src/Ubuntu/UbuntuToolkit/ucslotslayout_p.h 2016-06-17 11:26:12 +0000
1543+++ src/Ubuntu/UbuntuToolkit/ucslotslayout_p.h 2016-06-29 09:35:37 +0000
1544@@ -37,7 +37,7 @@
1545 #define SLOTSLAYOUT_BOTTOMMARGIN1_GU 1
1546 #define SLOTSLAYOUT_BOTTOMMARGIN2_GU 2
1547
1548-UT_NAMESPACE_BEGIN
1549+namespace UbuntuToolkit {
1550
1551 class UCSlotsLayoutPrivate : public QQuickItemPrivate
1552 {
1553
1554=== modified file 'src/Ubuntu/UbuntuToolkit/ucstatesaver.cpp'
1555--- src/Ubuntu/UbuntuToolkit/ucstatesaver.cpp 2016-06-17 11:26:12 +0000
1556+++ src/Ubuntu/UbuntuToolkit/ucstatesaver.cpp 2016-06-29 09:35:37 +0000
1557@@ -147,7 +147,7 @@
1558
1559 /*!
1560 * \qmltype StateSaver
1561- * \instantiates UCStateSaverAttached
1562+ * \instantiates UbuntuToolkit::UCStateSaverAttached
1563 * \inqmlmodule Ubuntu.Components
1564 * \ingroup ubuntu-services
1565 * \brief Attached properties to save component property states.
1566
1567=== modified file 'src/Ubuntu/UbuntuToolkit/ucstatesaver.h'
1568--- src/Ubuntu/UbuntuToolkit/ucstatesaver.h 2016-06-17 11:26:12 +0000
1569+++ src/Ubuntu/UbuntuToolkit/ucstatesaver.h 2016-06-29 09:35:37 +0000
1570@@ -23,7 +23,7 @@
1571 #include <QtQml/qqml.h>
1572 #include <ubuntutoolkitglobal.h>
1573
1574-UT_NAMESPACE_BEGIN
1575+namespace UbuntuToolkit {
1576
1577 class UCStateSaverAttachedPrivate;
1578 class UBUNTUTOOLKIT_EXPORT UCStateSaverAttached : public QObject
1579
1580=== modified file 'src/Ubuntu/UbuntuToolkit/ucstatesaver_p.h'
1581--- src/Ubuntu/UbuntuToolkit/ucstatesaver_p.h 2016-06-17 11:26:12 +0000
1582+++ src/Ubuntu/UbuntuToolkit/ucstatesaver_p.h 2016-06-29 09:35:37 +0000
1583@@ -23,7 +23,7 @@
1584
1585 #include <QStringList>
1586
1587-UT_NAMESPACE_BEGIN
1588+namespace UbuntuToolkit {
1589
1590 class UCStateSaverAttachedPrivate
1591 {
1592
1593=== modified file 'src/Ubuntu/UbuntuToolkit/ucstyleditembase.cpp'
1594--- src/Ubuntu/UbuntuToolkit/ucstyleditembase.cpp 2016-06-17 11:26:12 +0000
1595+++ src/Ubuntu/UbuntuToolkit/ucstyleditembase.cpp 2016-06-29 09:35:37 +0000
1596@@ -130,7 +130,7 @@
1597
1598 /*!
1599 * \qmltype StyledItem
1600- * \instantiates UCStyledItemBase
1601+ * \instantiates UbuntuToolkit::UCStyledItemBase
1602 * \inqmlmodule Ubuntu.Components
1603 * \ingroup ubuntu
1604 * \since Ubuntu.Components 1.1
1605
1606=== modified file 'src/Ubuntu/UbuntuToolkit/ucstyleditembase.h'
1607--- src/Ubuntu/UbuntuToolkit/ucstyleditembase.h 2016-06-17 11:26:12 +0000
1608+++ src/Ubuntu/UbuntuToolkit/ucstyleditembase.h 2016-06-29 09:35:37 +0000
1609@@ -23,7 +23,7 @@
1610 #include "ucthemingextension.h"
1611 #include "ubuntutoolkitglobal.h"
1612
1613-UT_NAMESPACE_BEGIN
1614+namespace UbuntuToolkit {
1615
1616 class UCStyledItemBasePrivate;
1617 class UCTheme;
1618
1619=== modified file 'src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h'
1620--- src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h 2016-06-17 11:26:12 +0000
1621+++ src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h 2016-06-29 09:35:37 +0000
1622@@ -26,7 +26,7 @@
1623
1624 class QQuickMouseArea;
1625
1626-UT_NAMESPACE_BEGIN
1627+namespace UbuntuToolkit {
1628
1629 class UCStyledItemBase;
1630 class UBUNTUTOOLKIT_EXPORT UCStyledItemBasePrivate : public QQuickItemPrivate, public UCImportVersionChecker
1631
1632=== modified file 'src/Ubuntu/UbuntuToolkit/ucstylehints.cpp'
1633--- src/Ubuntu/UbuntuToolkit/ucstylehints.cpp 2016-06-22 13:15:15 +0000
1634+++ src/Ubuntu/UbuntuToolkit/ucstylehints.cpp 2016-06-29 09:35:37 +0000
1635@@ -146,7 +146,7 @@
1636
1637 /*!
1638 * \qmltype StyleHints
1639- * \instantiates UCStyleHints
1640+ * \instantiates UbuntuToolkit::UCStyleHints
1641 * \inmodule Ubuntu Components 1.3
1642 * \ingroup ubuntu
1643 * \since Ubuntu.Components 1.3
1644
1645=== modified file 'src/Ubuntu/UbuntuToolkit/ucstylehints.h'
1646--- src/Ubuntu/UbuntuToolkit/ucstylehints.h 2016-06-22 13:15:15 +0000
1647+++ src/Ubuntu/UbuntuToolkit/ucstylehints.h 2016-06-29 09:35:37 +0000
1648@@ -30,7 +30,7 @@
1649
1650 class QQuickItem;
1651
1652-UT_NAMESPACE_BEGIN
1653+namespace UbuntuToolkit {
1654
1655 class UCStyleHintsParser;
1656 class UCStyledItemBase;
1657
1658=== modified file 'src/Ubuntu/UbuntuToolkit/uctheme.cpp'
1659--- src/Ubuntu/UbuntuToolkit/uctheme.cpp 2016-06-17 11:26:12 +0000
1660+++ src/Ubuntu/UbuntuToolkit/uctheme.cpp 2016-06-29 09:35:37 +0000
1661@@ -50,7 +50,7 @@
1662 quint16 UCTheme::previousVersion = 0;
1663 /*!
1664 * \qmltype ThemeSettings
1665- * \instantiates UCTheme
1666+ * \instantiates UbuntuToolkit::UCTheme
1667 * \inqmlmodule Ubuntu.Components
1668 * \since Ubuntu.Components 1.3
1669 * \ingroup theming
1670
1671=== modified file 'src/Ubuntu/UbuntuToolkit/uctheme.h'
1672--- src/Ubuntu/UbuntuToolkit/uctheme.h 2016-06-17 11:26:12 +0000
1673+++ src/Ubuntu/UbuntuToolkit/uctheme.h 2016-06-29 09:35:37 +0000
1674@@ -36,7 +36,7 @@
1675 class QQmlAbstractBinding;
1676 class QQuickItem;
1677
1678-UT_NAMESPACE_BEGIN
1679+namespace UbuntuToolkit {
1680
1681 class UCStyledItemBase;
1682 class UBUNTUTOOLKIT_EXPORT UCTheme : public QObject, public QQmlParserStatus
1683
1684=== modified file 'src/Ubuntu/UbuntuToolkit/ucthemingextension.h'
1685--- src/Ubuntu/UbuntuToolkit/ucthemingextension.h 2016-06-17 11:26:12 +0000
1686+++ src/Ubuntu/UbuntuToolkit/ucthemingextension.h 2016-06-29 09:35:37 +0000
1687@@ -29,7 +29,7 @@
1688
1689 class QQuickItem;
1690
1691-UT_NAMESPACE_BEGIN
1692+namespace UbuntuToolkit {
1693
1694 class UCTheme;
1695 class UBUNTUTOOLKIT_EXPORT UCThemingExtension
1696
1697=== modified file 'src/Ubuntu/UbuntuToolkit/ucubuntuanimation.h'
1698--- src/Ubuntu/UbuntuToolkit/ucubuntuanimation.h 2016-06-17 11:26:12 +0000
1699+++ src/Ubuntu/UbuntuToolkit/ucubuntuanimation.h 2016-06-29 09:35:37 +0000
1700@@ -22,7 +22,7 @@
1701 #include <QtCore/QEasingCurve>
1702 #include <ubuntutoolkitglobal.h>
1703
1704-UT_NAMESPACE_BEGIN
1705+namespace UbuntuToolkit {
1706
1707 class UBUNTUTOOLKIT_EXPORT UCUbuntuAnimation : public QObject
1708 {
1709
1710=== modified file 'src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp'
1711--- src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp 2016-06-17 15:55:58 +0000
1712+++ src/Ubuntu/UbuntuToolkit/ucubuntushape.cpp 2016-06-29 09:35:37 +0000
1713@@ -321,7 +321,7 @@
1714 const float radiusGuMap[3] = { 1.45f, 2.55f, 3.65f };
1715
1716 /*! \qmltype UbuntuShape
1717- \instantiates UCUbuntuShape
1718+ \instantiates UbuntuToolkit::UCUbuntuShape
1719 \inqmlmodule Ubuntu.Components
1720 \ingroup ubuntu
1721 \brief Rounded rectangle containing a source image blended over a background color.
1722
1723=== modified file 'src/Ubuntu/UbuntuToolkit/ucubuntushape.h'
1724--- src/Ubuntu/UbuntuToolkit/ucubuntushape.h 2016-06-17 15:55:58 +0000
1725+++ src/Ubuntu/UbuntuToolkit/ucubuntushape.h 2016-06-29 09:35:37 +0000
1726@@ -28,7 +28,7 @@
1727
1728 // --- Scene graph shader ---
1729
1730-UT_NAMESPACE_BEGIN
1731+namespace UbuntuToolkit {
1732
1733 class ShapeShader : public QSGMaterialShader
1734 {
1735
1736=== modified file 'src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.cpp'
1737--- src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.cpp 2016-06-17 11:26:12 +0000
1738+++ src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.cpp 2016-06-29 09:35:37 +0000
1739@@ -98,7 +98,7 @@
1740 // --- QtQuick item ---
1741
1742 /*! \qmltype UbuntuShapeOverlay
1743- \instantiates UCUbuntuShapeOverlay
1744+ \instantiates UbuntuToolkit::UCUbuntuShapeOverlay
1745 \inqmlmodule Ubuntu.Components
1746 \ingroup ubuntu
1747 \brief Extended UbuntuShape adding a colored overlay layer.
1748
1749=== modified file 'src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.h'
1750--- src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.h 2016-06-17 15:23:34 +0000
1751+++ src/Ubuntu/UbuntuToolkit/ucubuntushapeoverlay.h 2016-06-29 09:35:37 +0000
1752@@ -23,7 +23,7 @@
1753
1754 // --- Scene graph shader ---
1755
1756-UT_NAMESPACE_BEGIN
1757+namespace UbuntuToolkit {
1758
1759 class ShapeOverlayShader : public ShapeShader
1760 {
1761
1762=== modified file 'src/Ubuntu/UbuntuToolkit/ucunits.h'
1763--- src/Ubuntu/UbuntuToolkit/ucunits.h 2016-06-17 11:26:12 +0000
1764+++ src/Ubuntu/UbuntuToolkit/ucunits.h 2016-06-29 09:35:37 +0000
1765@@ -27,7 +27,7 @@
1766
1767 class QPlatformWindow;
1768
1769-UT_NAMESPACE_BEGIN
1770+namespace UbuntuToolkit {
1771
1772 class UBUNTUTOOLKIT_EXPORT UCUnits : public QObject
1773 {
1774
1775=== modified file 'src/Ubuntu/UbuntuToolkit/ucurihandler.cpp'
1776--- src/Ubuntu/UbuntuToolkit/ucurihandler.cpp 2016-06-17 11:26:12 +0000
1777+++ src/Ubuntu/UbuntuToolkit/ucurihandler.cpp 2016-06-29 09:35:37 +0000
1778@@ -37,7 +37,7 @@
1779
1780 /*!
1781 * \qmltype UriHandler
1782- * \instantiates UCUriHandler
1783+ * \instantiates UbuntuToolkit::UCUriHandler
1784 * \inqmlmodule Ubuntu.Components
1785 * \ingroup ubuntu
1786 * \brief Singleton signalling for opened URIs.
1787
1788=== modified file 'src/Ubuntu/UbuntuToolkit/ucurihandler.h'
1789--- src/Ubuntu/UbuntuToolkit/ucurihandler.h 2016-06-17 15:23:34 +0000
1790+++ src/Ubuntu/UbuntuToolkit/ucurihandler.h 2016-06-29 09:35:37 +0000
1791@@ -21,7 +21,7 @@
1792 #include <QtCore/QObject>
1793 #include <ubuntutoolkitglobal.h>
1794
1795-UT_NAMESPACE_BEGIN
1796+namespace UbuntuToolkit {
1797
1798 class UCUriHandler;
1799
1800
1801=== modified file 'src/Ubuntu/UbuntuToolkit/ucviewitemsattached.cpp'
1802--- src/Ubuntu/UbuntuToolkit/ucviewitemsattached.cpp 2016-06-22 13:15:15 +0000
1803+++ src/Ubuntu/UbuntuToolkit/ucviewitemsattached.cpp 2016-06-29 09:35:37 +0000
1804@@ -174,7 +174,7 @@
1805
1806 /*!
1807 * \qmltype ViewItems
1808- * \instantiates UCViewItemsAttached
1809+ * \instantiates UbuntuToolkit::UCViewItemsAttached
1810 * \inqmlmodule Ubuntu.Components
1811 * \ingroup ubuntu-listitem
1812 * \since Ubuntu.Components 1.2
1813
1814=== modified file 'src/Ubuntu/UbuntuToolkit/unitythemeiconprovider.h'
1815--- src/Ubuntu/UbuntuToolkit/unitythemeiconprovider.h 2016-06-17 11:26:12 +0000
1816+++ src/Ubuntu/UbuntuToolkit/unitythemeiconprovider.h 2016-06-29 09:35:37 +0000
1817@@ -22,7 +22,7 @@
1818 #include <QQuickImageProvider>
1819 #include <ubuntutoolkitglobal.h>
1820
1821-UT_NAMESPACE_BEGIN
1822+namespace UbuntuToolkit {
1823
1824 class UBUNTUTOOLKIT_EXPORT UnityThemeIconProvider: public QQuickImageProvider
1825 {
1826
1827=== modified file 'src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.h'
1828--- src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.h 2016-06-17 11:26:12 +0000
1829+++ src/Ubuntu/UbuntuToolkit/unixsignalhandler_p.h 2016-06-29 09:35:37 +0000
1830@@ -24,7 +24,7 @@
1831
1832 class QSocketNotifier;
1833
1834-UT_NAMESPACE_BEGIN
1835+namespace UbuntuToolkit {
1836
1837 class UnixSignalHandler : public QObject
1838 {

Subscribers

People subscribed via source and target branches