Merge lp:~aacid/unity-api/use_qenum into lp:unity-api
Proposed by
Albert Astals Cid
Status: | Merged |
---|---|
Approved by: | Lukáš Tinkl |
Approved revision: | 264 |
Merged at revision: | 263 |
Proposed branch: | lp:~aacid/unity-api/use_qenum |
Merge into: | lp:unity-api |
Prerequisite: | lp:~aacid/unity-api/add_suggest-override |
Diff against target: |
534 lines (+31/-49) 22 files modified
debian/control (+1/-1) include/unity/shell/application/ApplicationInfoInterface.h (+3/-4) include/unity/shell/application/ApplicationManagerInterface.h (+1/-1) include/unity/shell/application/Mir.h (+5/-5) include/unity/shell/application/MirSurfaceItemInterface.h (+1/-2) include/unity/shell/launcher/AppDrawerModelInterface.h (+1/-1) include/unity/shell/notifications/Enums.h (+3/-6) include/unity/shell/notifications/ModelInterface.h (+1/-1) include/unity/shell/scopes/CategoriesInterface.h (+1/-2) include/unity/shell/scopes/FiltersInterface.h (+2/-3) include/unity/shell/scopes/NavigationInterface.h (+1/-2) include/unity/shell/scopes/OptionSelectorOptionsInterface.h (+1/-2) include/unity/shell/scopes/PreviewModelInterface.h (+1/-2) include/unity/shell/scopes/PreviewWidgetModelInterface.h (+1/-2) include/unity/shell/scopes/ResultsModelInterface.h (+1/-2) include/unity/shell/scopes/ScopeInterface.h (+1/-2) include/unity/shell/scopes/ScopesInterface.h (+1/-2) include/unity/shell/scopes/SettingsModelInterface.h (+1/-2) include/unity/shell/scopes/ValueSliderValuesInterface.h (+1/-2) test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockActionModel.h (+1/-2) test/qmltest/mocks/plugins/Unity/Notifications/Mocks/MockModel.h (+1/-2) test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockPreviewWidgetModel.h (+1/-1) |
To merge this branch: | bzr merge lp:~aacid/unity-api/use_qenum |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paweł Stołowski (community) | Approve | ||
Lukáš Tinkl (community) | Approve | ||
Unity8 CI Bot | continuous-integration | Approve | |
Review via email: mp+313821@code.launchpad.net |
Commit message
Use the new Q_ENUM (Qt 5.5)
It's generally better than Q_ENUMS, one example it will fail to compile if you had specified the name wrong as in OptionSelectorO
Also fixes a warning about MockPreviewData being forward-declared as class but then being a struct
To post a comment you must log in.
PASSED: Continuous integration, rev:262 /unity8- jenkins. ubuntu. com/job/ lp-unity- api-ci/ 124/ /unity8- jenkins. ubuntu. com/job/ build/3642 /unity8- jenkins. ubuntu. com/job/ build-0- fetch/3670 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 3514 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 3514/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= zesty/3514 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= zesty/3514/ artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 3514 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 3514/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= zesty/3514 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= zesty/3514/ artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 3514 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 3514/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= zesty/3514 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= zesty/3514/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity- api-ci/ 124/rebuild
https:/