Merge lp:~faenil/ubuntu-ui-toolkit/fix_expandables_units_tests_qt56 into lp:ubuntu-ui-toolkit
- fix_expandables_units_tests_qt56
- Merge into trunk
Proposed by
Andrea Bernabei
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Andrea Bernabei | ||||
Proposed branch: | lp:~faenil/ubuntu-ui-toolkit/fix_expandables_units_tests_qt56 | ||||
Merge into: | lp:ubuntu-ui-toolkit | ||||
Diff against target: |
10760 lines (+2799/-2126) (has conflicts) 370 files modified
.qmake.conf (+4/-7) CODING (+63/-0) debian/control (+2/-2) debian/copyright (+5/-4) debian/rules (+1/-1) documentation/docs.sh (+9/-1) documentation/statesaving.qdoc (+1/-1) documentation/ubuntu-theming.qdoc (+1/-1) documentation/ubuntu-ui-toolkit-common.qdocconf (+23/-23) examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml (+13/-4) features/ubuntu_qt_module.prf (+12/-7) src/UbuntuGestures/UbuntuGestures.pro (+29/-36) src/UbuntuGestures/candidateinactivitytimer.cpp (+1/-1) src/UbuntuGestures/candidateinactivitytimer_p.h (+7/-7) src/UbuntuGestures/damper.cpp (+2/-1) src/UbuntuGestures/damper_p.h (+3/-3) src/UbuntuGestures/debughelpers.cpp (+4/-3) src/UbuntuGestures/debughelpers_p.h (+5/-7) src/UbuntuGestures/pool_p.h (+7/-7) src/UbuntuGestures/timer.cpp (+1/-1) src/UbuntuGestures/timer_p.h (+9/-9) src/UbuntuGestures/timesource.cpp (+2/-2) src/UbuntuGestures/timesource_p.h (+7/-6) src/UbuntuGestures/touchownershipevent.cpp (+1/-1) src/UbuntuGestures/touchownershipevent_p.h (+7/-6) src/UbuntuGestures/touchregistry.cpp (+11/-12) src/UbuntuGestures/touchregistry_p.h (+9/-11) src/UbuntuGestures/ubuntugesturesmodule.cpp (+3/-2) src/UbuntuGestures/ubuntugesturesmodule.h (+1/-1) src/UbuntuGestures/ucswipearea.cpp (+9/-12) src/UbuntuGestures/ucswipearea_p.h (+5/-9) src/UbuntuGestures/ucswipearea_p_p.h (+7/-7) src/UbuntuGestures/unownedtouchevent.cpp (+1/-1) src/UbuntuGestures/unownedtouchevent_p.h (+8/-7) src/UbuntuMetrics/UbuntuMetrics.pro (+16/-22) src/UbuntuMetrics/applicationmonitor.cpp (+1/-0) src/UbuntuMetrics/applicationmonitor.h (+3/-2) src/UbuntuMetrics/applicationmonitor_p.h (+6/-4) src/UbuntuMetrics/bitmaptext.cpp (+5/-3) src/UbuntuMetrics/bitmaptext_p.h (+2/-1) src/UbuntuMetrics/events.cpp (+6/-3) src/UbuntuMetrics/events_p.h (+6/-3) src/UbuntuMetrics/gputimer.cpp (+3/-1) src/UbuntuMetrics/gputimer_p.h (+3/-1) src/UbuntuMetrics/logger.cpp (+5/-4) src/UbuntuMetrics/logger.h (+2/-1) src/UbuntuMetrics/logger_p.h (+5/-3) src/UbuntuMetrics/overlay.cpp (+6/-3) src/UbuntuMetrics/overlay_p.h (+4/-3) src/UbuntuMetrics/ubuntumetricsglobal.h (+1/-1) src/UbuntuMetrics/ubuntumetricsglobal_p.h (+1/-1) src/UbuntuToolkit/UbuntuToolkit.pro (+218/-237) src/UbuntuToolkit/actionlist.cpp (+1/-0) src/UbuntuToolkit/actionlist_p.h (+6/-5) src/UbuntuToolkit/adapters/actionsproxy_p.cpp (+4/-3) src/UbuntuToolkit/adapters/actionsproxy_p.h (+2/-1) src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp (+5/-5) src/UbuntuToolkit/adapters/alarmsadapter_p.h (+7/-6) src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp (+7/-4) src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h (+1/-1) src/UbuntuToolkit/alarmmanager_p.cpp (+1/-0) src/UbuntuToolkit/alarmmanager_p.h (+5/-5) src/UbuntuToolkit/alarmmanager_p_p.h (+8/-6) src/UbuntuToolkit/asyncloader_p.h (+5/-4) src/UbuntuToolkit/asyncloader_p_p.h (+7/-6) src/UbuntuToolkit/colorutils.cpp (+2/-1) src/UbuntuToolkit/colorutils_p.h (+8/-6) src/UbuntuToolkit/exclusivegroup.cpp (+3/-3) src/UbuntuToolkit/exclusivegroup_p.h (+9/-10) src/UbuntuToolkit/filterbehavior_p.h (+7/-6) src/UbuntuToolkit/i18n.cpp (+4/-3) src/UbuntuToolkit/i18n_p.h (+5/-4) src/UbuntuToolkit/inversemouseareatype.cpp (+2/-0) src/UbuntuToolkit/inversemouseareatype_p.h (+8/-6) src/UbuntuToolkit/label_p.h (+3/-3) src/UbuntuToolkit/listener.cpp (+1/-1) src/UbuntuToolkit/listener_p.h (+5/-4) src/UbuntuToolkit/livetimer_p.cpp (+3/-2) src/UbuntuToolkit/livetimer_p.h (+8/-7) src/UbuntuToolkit/livetimer_p_p.h (+7/-7) src/UbuntuToolkit/menu.cpp (+11/-14) src/UbuntuToolkit/menu_p.h (+5/-6) src/UbuntuToolkit/menu_p_p.h (+3/-3) src/UbuntuToolkit/menubar.cpp (+4/-7) src/UbuntuToolkit/menubar_p.h (+3/-4) src/UbuntuToolkit/menubar_p_p.h (+3/-3) src/UbuntuToolkit/menugroup.cpp (+1/-0) src/UbuntuToolkit/menugroup_p.h (+4/-4) src/UbuntuToolkit/mousetouchadaptor.cpp (+5/-6) src/UbuntuToolkit/mousetouchadaptor_p.h (+5/-5) src/UbuntuToolkit/mousetouchadaptor_p_p.h (+9/-8) src/UbuntuToolkit/mousetouchadaptor_x11.cpp (+4/-5) src/UbuntuToolkit/privates/appheaderbase.cpp (+1/-0) src/UbuntuToolkit/privates/appheaderbase_p.h (+4/-4) src/UbuntuToolkit/privates/frame.cpp (+4/-2) src/UbuntuToolkit/privates/frame_p.h (+5/-4) src/UbuntuToolkit/privates/listitemdragarea.cpp (+6/-4) src/UbuntuToolkit/privates/listitemdragarea_p.h (+6/-5) src/UbuntuToolkit/privates/listitemdraghandler.cpp (+5/-4) src/UbuntuToolkit/privates/listitemdraghandler_p.h (+5/-4) src/UbuntuToolkit/privates/listitemselection.cpp (+2/-1) src/UbuntuToolkit/privates/listitemselection_p.h (+5/-4) src/UbuntuToolkit/privates/listviewextensions.cpp (+27/-26) src/UbuntuToolkit/privates/listviewextensions_p.h (+9/-4) src/UbuntuToolkit/privates/splitviewhandler.cpp (+6/-4) src/UbuntuToolkit/privates/splitviewhandler_p.h (+6/-5) src/UbuntuToolkit/privates/threelabelsslot_p.cpp (+2/-1) src/UbuntuToolkit/privates/threelabelsslot_p.h (+7/-7) src/UbuntuToolkit/privates/ucpagewrapper.cpp (+6/-5) src/UbuntuToolkit/privates/ucpagewrapper_p.h (+4/-4) src/UbuntuToolkit/privates/ucpagewrapper_p_p.h (+8/-7) src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp (+4/-3) src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h (+10/-9) src/UbuntuToolkit/privates/ucscrollbarutils.cpp (+2/-1) src/UbuntuToolkit/privates/ucscrollbarutils_p.h (+7/-6) src/UbuntuToolkit/propertychange_p.h (+5/-5) src/UbuntuToolkit/qquickclipboard.cpp (+2/-1) src/UbuntuToolkit/qquickclipboard_p.h (+5/-4) src/UbuntuToolkit/qquickclipboard_p_p.h (+7/-6) src/UbuntuToolkit/qquickmimedata.cpp (+5/-5) src/UbuntuToolkit/qquickmimedata_p.h (+6/-5) src/UbuntuToolkit/quickutils.cpp (+10/-10) src/UbuntuToolkit/quickutils_p.h (+3/-2) src/UbuntuToolkit/sortbehavior_p.h (+7/-6) src/UbuntuToolkit/sortfiltermodel_p.h (+8/-7) src/UbuntuToolkit/splitview.cpp (+5/-6) src/UbuntuToolkit/splitview_p.h (+1/-1) src/UbuntuToolkit/splitview_p_p.h (+2/-1) src/UbuntuToolkit/splitviewlayout.cpp (+3/-3) src/UbuntuToolkit/statesaverbackend_p.cpp (+8/-7) src/UbuntuToolkit/statesaverbackend_p.h (+4/-3) src/UbuntuToolkit/timeutils_p.h (+5/-5) src/UbuntuToolkit/tree.cpp (+2/-2) src/UbuntuToolkit/tree_p.h (+8/-7) src/UbuntuToolkit/ubuntutoolkitglobal.h (+1/-1) src/UbuntuToolkit/ubuntutoolkitmodule.cpp (+76/-78) src/UbuntuToolkit/ubuntutoolkitmodule.h (+4/-3) src/UbuntuToolkit/ucabstractbutton.cpp (+6/-4) src/UbuntuToolkit/ucabstractbutton_p.h (+6/-5) src/UbuntuToolkit/ucabstractbutton_p_p.h (+7/-6) src/UbuntuToolkit/ucaction.cpp (+16/-7) src/UbuntuToolkit/ucaction_p.h (+7/-6) src/UbuntuToolkit/ucactioncontext.cpp (+4/-2) src/UbuntuToolkit/ucactioncontext_p.h (+7/-6) src/UbuntuToolkit/ucactionitem.cpp (+4/-2) src/UbuntuToolkit/ucactionitem_p.h (+6/-5) src/UbuntuToolkit/ucactionitem_p_p.h (+7/-6) src/UbuntuToolkit/ucactionmanager.cpp (+2/-1) src/UbuntuToolkit/ucactionmanager_p.h (+5/-4) src/UbuntuToolkit/ucalarm.cpp (+3/-1) src/UbuntuToolkit/ucalarm_p.h (+6/-5) src/UbuntuToolkit/ucalarm_p_p.h (+7/-5) src/UbuntuToolkit/ucalarmmodel.cpp (+6/-4) src/UbuntuToolkit/ucalarmmodel_p.h (+5/-4) src/UbuntuToolkit/ucapplication.cpp (+3/-3) src/UbuntuToolkit/ucapplication_p.h (+5/-4) src/UbuntuToolkit/ucargument_p.h (+5/-4) src/UbuntuToolkit/ucarguments.cpp (+5/-3) src/UbuntuToolkit/ucarguments_p.h (+7/-6) src/UbuntuToolkit/ucbottomedge.cpp (+12/-11) src/UbuntuToolkit/ucbottomedge_p.h (+6/-5) src/UbuntuToolkit/ucbottomedge_p_p.h (+8/-7) src/UbuntuToolkit/ucbottomedgehint.cpp (+8/-6) src/UbuntuToolkit/ucbottomedgehint_p.h (+7/-6) src/UbuntuToolkit/ucbottomedgehint_p_p.h (+7/-7) src/UbuntuToolkit/ucbottomedgeregion.cpp (+3/-2) src/UbuntuToolkit/ucbottomedgeregion_p.h (+7/-6) src/UbuntuToolkit/ucbottomedgeregion_p_p.h (+8/-6) src/UbuntuToolkit/ucbottomedgestyle.cpp (+1/-0) src/UbuntuToolkit/ucbottomedgestyle_p.h (+5/-4) src/UbuntuToolkit/ucdefaulttheme.cpp (+3/-2) src/UbuntuToolkit/ucdefaulttheme_p.h (+6/-5) src/UbuntuToolkit/ucdeprecatedtheme.cpp (+6/-4) src/UbuntuToolkit/ucdeprecatedtheme_p.h (+6/-5) src/UbuntuToolkit/ucfontutils.cpp (+1/-1) src/UbuntuToolkit/ucfontutils_p.h (+5/-5) src/UbuntuToolkit/uchaptics.cpp (+4/-2) src/UbuntuToolkit/uchaptics_p.h (+4/-3) src/UbuntuToolkit/ucheader.cpp (+4/-2) src/UbuntuToolkit/ucheader_p.h (+5/-4) src/UbuntuToolkit/ucimportversionchecker_p.cpp (+3/-3) src/UbuntuToolkit/ucimportversionchecker_p.h (+3/-2) src/UbuntuToolkit/ucinversemouse_p.h (+8/-8) src/UbuntuToolkit/uclabel.cpp (+3/-2) src/UbuntuToolkit/uclabel_p.h (+8/-7) src/UbuntuToolkit/uclistitem.cpp (+21/-19) src/UbuntuToolkit/uclistitem_p.h (+6/-4) src/UbuntuToolkit/uclistitem_p_p.h (+9/-7) src/UbuntuToolkit/uclistitemactions.cpp (+6/-4) src/UbuntuToolkit/uclistitemactions_p.h (+5/-4) src/UbuntuToolkit/uclistitemactions_p_p.h (+7/-6) src/UbuntuToolkit/uclistitemlayout.cpp (+3/-2) src/UbuntuToolkit/uclistitemlayout_p.h (+5/-5) src/UbuntuToolkit/uclistitemstyle.cpp (+5/-3) src/UbuntuToolkit/uclistitemstyle_p.h (+6/-4) src/UbuntuToolkit/ucmainviewbase.cpp (+14/-14) src/UbuntuToolkit/ucmainviewbase_p.h (+4/-4) src/UbuntuToolkit/ucmainviewbase_p_p.h (+9/-7) src/UbuntuToolkit/ucmargins_p.h (+5/-4) src/UbuntuToolkit/ucmathutils.cpp (+2/-2) src/UbuntuToolkit/ucmathutils_p.h (+7/-7) src/UbuntuToolkit/ucmouse_p.h (+8/-8) src/UbuntuToolkit/ucmousefilters.cpp (+6/-6) src/UbuntuToolkit/ucpagetreenode.cpp (+1/-1) src/UbuntuToolkit/ucpagetreenode_p.h (+6/-5) src/UbuntuToolkit/ucpagetreenode_p_p.h (+8/-6) src/UbuntuToolkit/ucperformancemonitor.cpp (+1/-0) src/UbuntuToolkit/ucperformancemonitor_p.h (+7/-6) src/UbuntuToolkit/ucproportionalshape_p.h (+4/-4) src/UbuntuToolkit/ucqquickimageextension.cpp (+3/-3) src/UbuntuToolkit/ucqquickimageextension_p.h (+9/-8) src/UbuntuToolkit/ucscalingimageprovider_p.h (+6/-5) src/UbuntuToolkit/ucserviceproperties.cpp (+4/-2) src/UbuntuToolkit/ucserviceproperties_p.h (+5/-4) src/UbuntuToolkit/ucserviceproperties_p_p.h (+6/-5) src/UbuntuToolkit/ucslotslayout.cpp (+2/-1) src/UbuntuToolkit/ucslotslayout_p.h (+5/-4) src/UbuntuToolkit/ucslotslayout_p_p.h (+7/-7) src/UbuntuToolkit/ucstatesaver.cpp (+12/-9) src/UbuntuToolkit/ucstatesaver_p.h (+6/-5) src/UbuntuToolkit/ucstatesaver_p_p.h (+7/-7) src/UbuntuToolkit/ucstyleditembase.cpp (+5/-3) src/UbuntuToolkit/ucstyleditembase_p.h (+6/-5) src/UbuntuToolkit/ucstyleditembase_p_p.h (+8/-6) src/UbuntuToolkit/ucstylehints.cpp (+4/-2) src/UbuntuToolkit/ucstylehints_p.h (+7/-6) src/UbuntuToolkit/uctheme.cpp (+14/-14) src/UbuntuToolkit/uctheme_p.h (+6/-7) src/UbuntuToolkit/ucthemingextension.cpp (+5/-3) src/UbuntuToolkit/ucthemingextension_p.h (+7/-7) src/UbuntuToolkit/ucubuntuanimation.cpp (+1/-1) src/UbuntuToolkit/ucubuntuanimation_p.h (+6/-6) src/UbuntuToolkit/ucubuntushape.cpp (+7/-4) src/UbuntuToolkit/ucubuntushape_p.h (+7/-6) src/UbuntuToolkit/ucubuntushapeoverlay_p.h (+3/-3) src/UbuntuToolkit/ucunits.cpp (+4/-5) src/UbuntuToolkit/ucunits_p.h (+6/-5) src/UbuntuToolkit/ucurihandler.cpp (+4/-1) src/UbuntuToolkit/ucurihandler_p.h (+6/-4) src/UbuntuToolkit/ucviewitemsattached.cpp (+13/-12) src/UbuntuToolkit/unitythemeiconprovider.cpp (+6/-6) src/UbuntuToolkit/unitythemeiconprovider_p.h (+7/-6) src/UbuntuToolkit/unixsignalhandler_p.cpp (+3/-2) src/UbuntuToolkit/unixsignalhandler_p.h (+6/-4) src/imports/Components/1.3/ComboButton.qml (+1/-5) src/imports/Components/1.3/ProgressBar.qml (+4/-2) src/imports/Components/1.3/UbuntuListView.qml (+5/-1) src/imports/Components/ListItems/1.2/ExpandablesColumn.qml (+3/-3) src/imports/Components/ListItems/1.3/Base.qml (+0/-4) src/imports/Components/Popups/1.3/popupUtils.js (+5/-0) src/imports/Components/Themes/Ambiance/1.3/OverflowPanel.qml (+0/-1) src/imports/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml (+78/-58) src/imports/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+49/-28) src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml (+1/-7) src/imports/Components/plugin/plugin.cpp (+5/-4) src/imports/Components/plugin/plugin.h (+4/-4) src/imports/Components/plugin/plugin.pri (+3/-6) src/imports/Components/plugin/ucnamespace.h (+1/-2) src/imports/Layouts/plugin/plugin.pri (+5/-8) src/imports/Layouts/plugin/propertychanges.cpp (+5/-4) src/imports/Layouts/plugin/propertychanges_p.h (+3/-4) src/imports/Layouts/plugin/ulconditionallayout.cpp (+3/-4) src/imports/Layouts/plugin/ulconditionallayout.h (+1/-1) src/imports/Layouts/plugin/ullayouts.cpp (+4/-3) src/imports/Layouts/plugin/ullayouts.h (+1/-0) src/imports/Layouts/plugin/ullayouts_p.h (+2/-0) src/imports/Layouts/plugin/ullayoutsattached.cpp (+2/-2) src/imports/Layouts/plugin/ulplugin.cpp (+3/-2) src/imports/Layouts/plugin/ulplugin.h (+4/-5) src/imports/PerformanceMetrics/plugin/rendertimer.cpp (+2/-1) src/imports/PerformanceMetrics/plugin/upmcpuusage.cpp (+1/-0) src/imports/PerformanceMetrics/plugin/upmcpuusage.h (+4/-2) src/imports/PerformanceMetrics/plugin/upmgraphmodel.cpp (+2/-1) src/imports/PerformanceMetrics/plugin/upmplugin.cpp (+5/-4) src/imports/PerformanceMetrics/plugin/upmplugin.h (+4/-5) src/imports/PerformanceMetrics/plugin/upmrenderingtimes.cpp (+2/-1) src/imports/PerformanceMetrics/plugin/upmrenderingtimes.h (+5/-4) src/imports/PerformanceMetrics/plugin/upmtexturefromimage.cpp (+2/-1) src/imports/Test/Test.pro (+1/-0) src/imports/Test/plugin/plugin.pri (+2/-3) src/imports/Test/plugin/testplugin.cpp (+4/-2) src/imports/Test/plugin/testplugin.h (+1/-1) src/imports/Test/plugin/uctestcase.cpp (+2/-2) src/imports/Test/plugin/uctestcase.h (+4/-4) src/imports/Test/plugin/uctestextras.cpp (+7/-8) src/imports/Test/plugin/uctestextras.h (+3/-3) src/src.pro (+9/-9) sync.profile (+3/-3) tests/api/Extinct/Animals/plugin/pangaea.h (+3/-3) tests/api/Extinct/Animals/plugin/plugin.cpp (+6/-5) tests/api/Extinct/Animals/plugin/plugin.h (+3/-3) tests/api/Extinct/Animals/plugin/plugin.pri (+1/-2) tests/api/Extinct/Animals/plugin/rune.cpp (+2/-3) tests/api/Extinct/Animals/plugin/rune.h (+5/-5) tests/api/Extinct/Animals/plugin/smilodon.h (+3/-3) tests/api/Extinct/Animals/plugin/tarpan.h (+3/-3) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/MyDialog.qml (+36/-0) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.WindowTestCase.qml (+36/-0) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py (+19/-0) tests/unit/alarms/tst_alarms.cpp (+10/-11) tests/unit/animator/tst_animator.cpp (+7/-8) tests/unit/animator/tst_animator.qml (+1/-1) tests/unit/argument/tst_argument.cpp (+2/-3) tests/unit/arguments/tst_arguments.cpp (+7/-8) tests/unit/asyncloader/tst_asyncloader.cpp (+5/-4) tests/unit/bottomedge/tst_bottomedge.cpp (+10/-10) tests/unit/components/FIXME-QT56_pagestack_deprecated_toolbar.qml (+2/-0) tests/unit/components/tst_action.qml (+26/-0) tests/unit/components/tst_components.cpp (+3/-2) tests/unit/components_benchmark/tst_components_benchmark.cpp (+5/-5) tests/unit/custom_qpa/main.cpp (+1/-1) tests/unit/custom_qpa/qcustombackingstore.cpp (+5/-5) tests/unit/custom_qpa/qcustombackingstore.h (+2/-2) tests/unit/custom_qpa/qcustomintegration.cpp (+6/-6) tests/unit/custom_qpa/qcustomintegration.h (+2/-2) tests/unit/deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+4/-4) tests/unit/i18n/LocalizedApp/src/tst_i18n_LocalizedApp.cpp (+15/-17) tests/unit/i18n/RelativeTime/src/tst_i18n_RelativeTime.cpp (+15/-18) tests/unit/iconprovider/tst_iconprovider.cpp (+0/-1) tests/unit/inversemousearea/tst_inversemouseareatest.cpp (+7/-8) tests/unit/layout_dependency.pri (+1/-1) tests/unit/layouts/tst_layouts.cpp (+10/-13) tests/unit/mainview/tst_mainview.cpp (+14/-14) tests/unit/mousefilters/tst_mousefilterstest.cpp (+9/-11) tests/unit/orientation/tst_orientation.cpp (+8/-9) tests/unit/page/tst_page.cpp (+4/-4) tests/unit/performance/tst_performance.cpp (+3/-4) tests/unit/plugin_dependency.pri (+2/-1) tests/unit/qmltemplate/tst_qmltemplate.cpp (+3/-2) tests/unit/qquick_image_extension/tst_qquick_image_extension.cpp (+3/-5) tests/unit/quickutils/tst_quickutils.cpp (+3/-3) tests/unit/recreateview/tst_recreateview.cpp (+2/-3) tests/unit/serviceproperties/tst_serviceproperties.cpp (+5/-5) tests/unit/statesaver/tst_statesaver.cpp (+16/-16) tests/unit/subtheming/tst_subtheming.cpp (+9/-9) tests/unit/swipearea/GestureTest.cpp (+8/-9) tests/unit/swipearea/GestureTest.h (+7/-9) tests/unit/swipearea/tst_swipearea.cpp (+7/-9) tests/unit/test-include.pri (+1/-3) tests/unit/test/tst_test.cpp (+3/-2) tests/unit/testparser/main.cpp (+7/-8) tests/unit/theme/tst_theme.cpp (+3/-2) tests/unit/touchregistry/touchregistry.pro (+1/-1) tests/unit/touchregistry/tst_TouchRegistry.cpp (+4/-4) tests/unit/tree/tst_tree.cpp (+2/-3) tests/unit/ubuntu_shape/tst_ubuntu_shape.cpp (+2/-2) tests/unit/unit.pro (+2/-2) tests/unit/units/scale/tst_units_scale.cpp (+1/-2) tests/unit/units/units.pro (+2/-2) tests/unit/visual/FIXME-QT56_listitem.12.qml (+1/-0) tests/unit/visual/FIXME-QT56_listitem.13.qml (+1/-0) tests/unit/visual/FIXME-QT56_listitem_focus.13.qml (+1/-0) tests/unit/visual/FIXME-QT56_pagehead_sections_bug1511839.13.qml (+2/-0) tests/unit/visual/FIXME-QT56_scrollbar.13.qml (+239/-126) tests/unit/visual/FIXME-QT56_scrollbar_header.13.qml (+1/-0) tests/unit/visual/FIXME-QT56_sections.13.qml (+1/-0) tests/unit/visual/FIXME-QT56_textarea.11.qml (+1/-0) tests/unit/visual/FIXME-QT56_textfield.11.qml (+1/-0) tests/unit/visual/FIXME-QT56_ubuntulistview.10.qml (+1/-0) tests/unit/visual/ScrollbarTestCase13.qml (+3/-0) tests/unit/visual/tabsmodel.cpp (+0/-1) tests/unit/visual/tabsmodel.h (+2/-3) tests/unit/visual/tst_actionbar.13.qml (+0/-1) tests/unit/visual/tst_actionlist.13.qml (+86/-0) tests/unit/visual/tst_expandables.11.qml (+2/-0) tests/unit/visual/tst_expandablescolumn.11.qml (+5/-5) tests/unit/visual/tst_focus.13.qml (+5/-3) tests/unit/visual/tst_listitem_focus_bug.13.qml (+81/-0) tests/unit/visual/tst_visual.cpp (+3/-3) Conflict adding file tests/unit/visual/tst_actionlist.13.qml. Moved existing file to tests/unit/visual/tst_actionlist.13.qml.moved. |
||||
To merge this branch: | bzr merge lp:~faenil/ubuntu-ui-toolkit/fix_expandables_units_tests_qt56 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Pending | ||
Review via email: mp+306023@code.launchpad.net |
Commit message
Qt5.6: Fix expandablescolu
We were previously misusing mapToItem by not passing x/y parameters
and relying on JS to initialize them to 0.
Qt5.6 fixes QTBUG-41686 and requires x/y to be explicitly passed.
Description of the change
Qt5.6: Fix expandablescolu
We were previously misusing mapToItem by not passing x/y parameters
and relying on JS to initialize them to 0.
Qt5.6 fixes QTBUG-41686 and requires x/y to be explicitly passed.
To post a comment you must log in.
Unmerged revisions
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 2016-07-25 14:02:18 +0000 |
3 | +++ .qmake.conf 2016-09-17 11:46:32 +0000 |
4 | @@ -15,13 +15,10 @@ |
5 | |
6 | exists($$PWD/../qt.pro) { |
7 | CONFIG += build_with_qt |
8 | -} |
9 | - |
10 | -*-g++* { |
11 | - GCC4 = $$system( gcc -dumpversion | grep "^4.[0-9]" ) |
12 | - if (isEmpty(GCC4)) { |
13 | - QMAKE_CXXFLAGS += -Wsuggest-override |
14 | - } |
15 | +} else { |
16 | + # When built as a Qt submodule, -Wsuggest-override breaks the build. That's |
17 | + # fixed in Qt 5.6. See https://codereview.qt-project.org/#/c/169969/ |
18 | + gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4): QMAKE_CXXFLAGS += -Wsuggest-override |
19 | } |
20 | |
21 | # FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace. |
22 | |
23 | === added file 'CODING' |
24 | --- CODING 1970-01-01 00:00:00 +0000 |
25 | +++ CODING 2016-09-17 11:46:32 +0000 |
26 | @@ -0,0 +1,63 @@ |
27 | +C++ coding style |
28 | +================ |
29 | + |
30 | +The Ubuntu UI Toolkit follows the Qt conventions, see: |
31 | + |
32 | + - https://wiki.qt.io/Coding_Conventions |
33 | + - https://wiki.qt.io/Qt_Coding_Style |
34 | + |
35 | +On top of it we add the few clarifications listed below. |
36 | + |
37 | + |
38 | +Header inclusion |
39 | +---------------- |
40 | + |
41 | +1/ When including Qt or UITK headers, always prefix with the project name. Use: |
42 | + |
43 | + #include <QtCore/QMap> |
44 | + #include <UbuntuMetrics/applicationmonitor.h> |
45 | + |
46 | + not |
47 | + |
48 | + #include <QMap> |
49 | + #include <applicationmonitor.h> |
50 | + |
51 | +2/ For readability reasons and to avoid hidden dependencies, headers should be |
52 | + included in ordered sections, separated by an empty line, as follows: |
53 | + |
54 | + // The project's related header (for instance here for foo.cpp). |
55 | + #include "foo.h" |
56 | + |
57 | + // C standard library headers. |
58 | + #include <sys/types.h> |
59 | + #include <unistd.h> |
60 | + |
61 | + // C++ standard library headers. |
62 | + #include <functional> |
63 | + #include <hash_map> |
64 | + #include <vector> |
65 | + |
66 | + // Qt and UITK headers. Try to first list QtCore and QtGui headers. Private |
67 | + // headers come right after public headers of the same project. |
68 | + #include <QtCore/QDebug> |
69 | + #include <QtCore/QHash> |
70 | + #include <QtCore/private/qobject_p.h> |
71 | + #include <QtGui/QWindow> |
72 | + #include <QtGui/private/qcolor_p.h> |
73 | + #include <UbuntuMetrics/applicationmonitor.h> |
74 | + |
75 | + // Other libraries headers. |
76 | + #include <gst/gst.h> |
77 | + #include <boost/call_traits.hpp> |
78 | + |
79 | + // The project's headers. |
80 | + #include "bar.h" |
81 | + #include "baz_p.h" |
82 | + |
83 | +3/ For libraries, the "foo" inclusion variant must be used in C++ |
84 | + source files for the project's headers. The <Project/foo.h> and |
85 | + <Project/private/foo_p.h> inclusion variant must be used for the |
86 | + project's headers in private and public headers, wherever the |
87 | + header is located in the source tree. That ensures the inclusion of |
88 | + private headers by external projects (or by our unit tests) won't |
89 | + break. |
90 | |
91 | === modified file 'debian/control' |
92 | --- debian/control 2016-08-22 05:35:24 +0000 |
93 | +++ debian/control 2016-09-17 11:46:32 +0000 |
94 | @@ -55,7 +55,7 @@ |
95 | qtsvg5-doc-html, |
96 | qttools5-dev-tools, |
97 | qtwebkit5-doc-html, |
98 | - suru-icon-theme, |
99 | + suru-icon-theme (>= 14.04+16.10.20160720), |
100 | unity-action-doc, |
101 | uuid-runtime, |
102 | xvfb, |
103 | @@ -80,7 +80,7 @@ |
104 | qml-module-ubuntu-components-labs, |
105 | qml-module-ubuntu-performancemetrics, |
106 | qtdeclarative5-unity-action-plugin (>= 1.1.0), |
107 | - suru-icon-theme, |
108 | + suru-icon-theme (>= 14.04+16.10.20160720), |
109 | ttf-ubuntu-font-family, |
110 | ubuntu-ui-toolkit-theme (= ${binary:Version}), |
111 | ${misc:Depends}, |
112 | |
113 | === modified file 'debian/copyright' |
114 | --- debian/copyright 2016-03-04 11:59:46 +0000 |
115 | +++ debian/copyright 2016-09-17 11:46:32 +0000 |
116 | @@ -6,9 +6,10 @@ |
117 | Copyright: 2012-2013 Canonical Ltd. |
118 | License: LGPL-3.0 |
119 | |
120 | -Files: modules/Ubuntu/Components/Themes/Ambiance/artwork/* |
121 | - modules/Ubuntu/Components/artwork/* |
122 | - modules/Ubuntu/Components/ListItems/artwork/* |
123 | +Files: src/imports/Components/artwork/* |
124 | + src/imports/Components/Themes/Ambiance/artwork/* |
125 | + src/imports/Components/Themes/SuruDark/artwork/* |
126 | + src/imports/Components/Themes/SuruGradient/artwork/* |
127 | Copyright: 2004-2013, Canonical Ltd. |
128 | License: CC-BY-SA-3.0 |
129 | Unless otherwise indicated, artwork is available under the Creative |
130 | @@ -335,7 +336,7 @@ |
131 | NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
132 | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
133 | |
134 | -Files: modules/Ubuntu/Components/tools/3rd_party/edtaa3func.c |
135 | +Files: src/UbuntuToolkit/tools/3rd_party/edtaa3func.c |
136 | Copyright: 2009-2012, Stefan Gustavson <stefan.gustavson@gmail.com> |
137 | License: MIT |
138 | |
139 | |
140 | === modified file 'debian/rules' |
141 | --- debian/rules 2016-08-30 14:25:49 +0000 |
142 | +++ debian/rules 2016-09-17 11:46:32 +0000 |
143 | @@ -13,7 +13,7 @@ |
144 | |
145 | # Skip tests on the archs they are known to be flaky with current configuration |
146 | testskip_architectures := powerpc arm64 ppc64el s390x |
147 | -testskip_series := yakkety xenial |
148 | +testskip_series := |
149 | |
150 | override_dh_auto_configure: |
151 | qmake -r |
152 | |
153 | === modified file 'documentation/docs.sh' |
154 | --- documentation/docs.sh 2016-07-18 11:39:59 +0000 |
155 | +++ documentation/docs.sh 2016-09-17 11:46:32 +0000 |
156 | @@ -13,7 +13,15 @@ |
157 | # |
158 | # You should have received a copy of the GNU Lesser General Public License |
159 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
160 | -# |
161 | + |
162 | +# FIXME(loicm) |
163 | +# Since the new src/ layout (src/imports/ for QML modules and src/ for libs), |
164 | +# the parsing order of the source files has changed. qdoc first stores all the |
165 | +# file names and then does a sort (QMap iteration) which makes |
166 | +# ucmainviewbase.cpp parsed before MainView.qml (UbuntuToolkit is sorted before |
167 | +# imports ASCII-wise). The result is that qdoc is unable to link to properties |
168 | +# inherited from UCMainViewBase like applicationName, so constructs like that |
169 | +# don't work: \l MainView::applicationName... |
170 | |
171 | QDOC=$1 |
172 | QHELPGENERATOR=$2 |
173 | |
174 | === modified file 'documentation/statesaving.qdoc' |
175 | --- documentation/statesaving.qdoc 2016-01-22 14:58:16 +0000 |
176 | +++ documentation/statesaving.qdoc 2016-09-17 11:46:32 +0000 |
177 | @@ -53,7 +53,7 @@ |
178 | for the application. However runtime application name change would require |
179 | application restart. |
180 | |
181 | - Having these preconditions, we can deduct that \l MainView::applicationName |
182 | + Having these preconditions, we can deduct that \l {MainView}'s applicationName |
183 | property is one of the properties which cannot be serialized. |
184 | |
185 | \section1 IDs |
186 | |
187 | === modified file 'documentation/ubuntu-theming.qdoc' |
188 | --- documentation/ubuntu-theming.qdoc 2016-03-17 17:43:14 +0000 |
189 | +++ documentation/ubuntu-theming.qdoc 2016-09-17 11:46:32 +0000 |
190 | @@ -127,7 +127,7 @@ |
191 | * A typical example of such a style API is the PullToRefresh component's style: |
192 | * \snippet Styles/1.2/PullToRefreshStyle.qml 0 |
193 | * The default style implementation can be found under Ubuntu.Components.Themes.Ambiance |
194 | - * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml} |
195 | + * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/src/imports/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml} |
196 | * {PullToRefreshStyle.qml}. |
197 | * |
198 | * Beside these, component styles may provide default values for colors, fonts, widths, |
199 | |
200 | === modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf' |
201 | --- documentation/ubuntu-ui-toolkit-common.qdocconf 2016-06-21 14:21:46 +0000 |
202 | +++ documentation/ubuntu-ui-toolkit-common.qdocconf 2016-09-17 11:46:32 +0000 |
203 | @@ -4,36 +4,36 @@ |
204 | defines = Q_QDOC |
205 | sourcedirs = ./ |
206 | headerdirs = ../include |
207 | -sourcedirs += ../src/Ubuntu/Components |
208 | -headerdirs += ../src/Ubuntu/Components/plugin |
209 | -sourcedirs += ../src/Ubuntu/UbuntuToolkit |
210 | -headerdirs += ../src/Ubuntu/UbuntuToolkit |
211 | -sourcedirs += ../src/Ubuntu/UbuntuGestures |
212 | -headerdirs += ../src/Ubuntu/UbuntuGestures |
213 | -sourcedirs += ../src/Ubuntu/Layouts |
214 | -headerdirs += ../src/Ubuntu/Layouts/plugin |
215 | -sourcedirs += ../src/Ubuntu/PerformanceMetrics |
216 | -headerdirs += ../src/Ubuntu/PerformanceMetrics/plugin |
217 | -sourcedirs += ../src/Ubuntu/Test |
218 | -headerdirs += ../src/Ubuntu/Test/plugin |
219 | +sourcedirs += ../src/imports/Components |
220 | +headerdirs += ../src/imports/Components/plugin |
221 | +sourcedirs += ../src/UbuntuToolkit |
222 | +headerdirs += ../src/UbuntuToolkit |
223 | +sourcedirs += ../src/UbuntuGestures |
224 | +headerdirs += ../src/UbuntuGestures |
225 | +sourcedirs += ../src/imports/Layouts |
226 | +headerdirs += ../src/imports/Layouts/plugin |
227 | +sourcedirs += ../src/imports/PerformanceMetrics |
228 | +headerdirs += ../src/imports/PerformanceMetrics/plugin |
229 | +sourcedirs += ../src/imports/Test |
230 | +headerdirs += ../src/imports/Test/plugin |
231 | exampledirs += snippets |
232 | exampledirs += ../examples |
233 | -exampledirs += ../src/Ubuntu/Components |
234 | -excludedirs += ../src/Ubuntu/Components/1.0 |
235 | -excludedirs += ../src/Ubuntu/Components/1.1 |
236 | -excludedirs += ../src/Ubuntu/Components/1.2 |
237 | -excludedirs += ../src/Ubuntu/Components/ListItems/1.2 |
238 | -excludedirs += ../src/Ubuntu/Components/Pickers/1.2 |
239 | -excludedirs += ../src/Ubuntu/Components/Popups/1.2 |
240 | -excludedirs += ../src/Ubuntu/Components/Themes/Ambiance |
241 | -excludedirs += ../src/Ubuntu/Components/Themes/SuruDark |
242 | +exampledirs += ../src/imports/Components |
243 | +excludedirs += ../src/imports/Components/1.0 |
244 | +excludedirs += ../src/imports/Components/1.1 |
245 | +excludedirs += ../src/imports/Components/1.2 |
246 | +excludedirs += ../src/imports/Components/ListItems/1.2 |
247 | +excludedirs += ../src/imports/Components/Pickers/1.2 |
248 | +excludedirs += ../src/imports/Components/Popups/1.2 |
249 | +excludedirs += ../src/imports/Components/Themes/Ambiance |
250 | +excludedirs += ../src/imports/Components/Themes/SuruDark |
251 | excludedirs += ../documentation/autopilot-helpers/_build/html/_static |
252 | imagedirs = images |
253 | sources.fileextensions = "*.qml *.qdoc *.cpp *.js" |
254 | headers.fileextensions = "*.h" |
255 | # exclude qml files that have the component documented in a separate qdoc file |
256 | -excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js |
257 | -excludefiles += ../src/Ubuntu/UbuntuToolkit/asyncloader.cpp |
258 | +excludefiles += $BLD/../src/imports/Components/1.3/PageWrapperUtils.js |
259 | +excludefiles += ../src/UbuntuToolkit/asyncloader.cpp |
260 | outputdir = $BLD/html |
261 | outputformats = HTML |
262 | version = 1.3 |
263 | |
264 | === modified file 'examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml' |
265 | --- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml 2015-04-25 08:18:45 +0000 |
266 | +++ examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml 2016-09-17 11:46:32 +0000 |
267 | @@ -56,13 +56,13 @@ |
268 | } |
269 | |
270 | TemplateRow { |
271 | - title: i18n.tr("No label") |
272 | + title: progressTypeFlip.indeterminate ? i18n.tr("Infinite") : i18n.tr("Standard") |
273 | |
274 | ProgressBar { |
275 | - id: progressNoLabel |
276 | + id: progressTypeFlip |
277 | objectName: "progressbar_nolabel" |
278 | - width: parent.width |
279 | - showProgressPercentage: false |
280 | + anchors.verticalCenter: parent.verticalCenter |
281 | + width: parent.width - (switchBox.width + label.width + 2 * parent.spacing) |
282 | |
283 | SequentialAnimation on value { |
284 | loops: Animation.Infinite |
285 | @@ -74,6 +74,15 @@ |
286 | PauseAnimation {duration: 1000} |
287 | } |
288 | } |
289 | + Switch { |
290 | + id: switchBox |
291 | + checked: progressTypeFlip.indeterminate |
292 | + onTriggered: progressTypeFlip.indeterminate = !progressTypeFlip.indeterminate |
293 | + } |
294 | + Label { |
295 | + id: label |
296 | + text: progressTypeFlip.indeterminate ? i18n.tr("to standard") : i18n.tr("to infinite") |
297 | + } |
298 | } |
299 | } |
300 | |
301 | |
302 | === modified file 'features/ubuntu_qt_module.prf' |
303 | --- features/ubuntu_qt_module.prf 2016-06-17 13:42:23 +0000 |
304 | +++ features/ubuntu_qt_module.prf 2016-09-17 11:46:32 +0000 |
305 | @@ -1,14 +1,18 @@ |
306 | -!build_with_qt: { |
307 | - #enable autocreation of include directory |
308 | - CONFIG += git_build |
309 | -} |
310 | +# Enables the copy of private and public headers to an include directory at the |
311 | +# root of the sources before compilation and the copy of the compiled libraries |
312 | +# after compilation. Must be set before loading qt_module. |
313 | +CONFIG += git_build |
314 | |
315 | load(qt_module) |
316 | |
317 | +# Disable CMake config file creation. Must be set after loading qt_module. |
318 | CONFIG -= create_cmake |
319 | |
320 | -# when building against the system Qt we pick up the CXX_FLAGS for a release build |
321 | -# reset them to the default debug build flags |
322 | +# Common config options. |
323 | +CONFIG += dll no_keywords c++11 |
324 | + |
325 | +# When building against the system Qt we pick up the CXX_FLAGS for a release |
326 | +# build reset them to the default debug build flags. |
327 | !build_with_qt: { |
328 | CONFIG(debug, debug|release) { |
329 | QMAKE_CFLAGS = $$QMAKE_CFLAGS_DEBUG |
330 | @@ -16,8 +20,9 @@ |
331 | } |
332 | } |
333 | |
334 | +# Make all warnings into errors. |
335 | QMAKE_CXXFLAGS += -Werror |
336 | |
337 | -#do not warn for deprecated declarations |
338 | +# Do not warn for deprecated declarations. |
339 | QMAKE_CXXFLAGS -= -Werror=deprecated-declarations |
340 | DEFINES -= QT_DEPRECATED_WARNINGS |
341 | |
342 | === removed directory 'src/Ubuntu/Components/ListItems/artwork' |
343 | === renamed directory 'src/Ubuntu/UbuntuGestures' => 'src/UbuntuGestures' |
344 | === modified file 'src/UbuntuGestures/UbuntuGestures.pro' |
345 | --- src/Ubuntu/UbuntuGestures/UbuntuGestures.pro 2016-07-06 11:27:11 +0000 |
346 | +++ src/UbuntuGestures/UbuntuGestures.pro 2016-09-17 11:46:32 +0000 |
347 | @@ -1,40 +1,33 @@ |
348 | -TEMPLATE=lib |
349 | -TARGET=UbuntuGestures |
350 | - |
351 | -QT *= core-private gui-private qml qml-private quick quick-private |
352 | - |
353 | -CONFIG += dll no_keywords c++11 |
354 | - |
355 | -INCLUDEPATH+=$$PWD |
356 | +TARGET = UbuntuGestures |
357 | +QT = core-private gui-private qml-private quick-private |
358 | |
359 | DEFINES += UBUNTUGESTURES_LIBRARY |
360 | |
361 | -load(qt_build_config) |
362 | +HEADERS += \ |
363 | + $$PWD/candidateinactivitytimer_p.h \ |
364 | + $$PWD/damper_p.h \ |
365 | + $$PWD/debughelpers_p.h \ |
366 | + $$PWD/pool_p.h \ |
367 | + $$PWD/timer_p.h \ |
368 | + $$PWD/timesource_p.h \ |
369 | + $$PWD/touchownershipevent_p.h \ |
370 | + $$PWD/touchregistry_p.h \ |
371 | + $$PWD/ubuntugesturesglobal.h \ |
372 | + $$PWD/ubuntugesturesmodule.h \ |
373 | + $$PWD/ucswipearea_p.h \ |
374 | + $$PWD/ucswipearea_p_p.h \ |
375 | + $$PWD/unownedtouchevent_p.h |
376 | + |
377 | +SOURCES += \ |
378 | + $$PWD/candidateinactivitytimer.cpp \ |
379 | + $$PWD/damper.cpp \ |
380 | + $$PWD/debughelpers.cpp \ |
381 | + $$PWD/timer.cpp \ |
382 | + $$PWD/timesource.cpp \ |
383 | + $$PWD/touchownershipevent.cpp \ |
384 | + $$PWD/touchregistry.cpp \ |
385 | + $$PWD/ubuntugesturesmodule.cpp \ |
386 | + $$PWD/ucswipearea.cpp \ |
387 | + $$PWD/unownedtouchevent.cpp |
388 | + |
389 | load(ubuntu_qt_module) |
390 | - |
391 | -HEADERS += candidateinactivitytimer_p.h \ |
392 | - debughelpers_p.h \ |
393 | - timer_p.h \ |
394 | - timesource_p.h \ |
395 | - touchownershipevent_p.h \ |
396 | - touchregistry_p.h \ |
397 | - unownedtouchevent_p.h \ |
398 | - ubuntugesturesglobal.h \ |
399 | - pool_p.h \ |
400 | - ucswipearea_p.h \ |
401 | - ucswipearea_p_p.h \ |
402 | - damper_p.h \ |
403 | - ubuntugesturesmodule.h |
404 | - |
405 | - |
406 | -SOURCES += candidateinactivitytimer.cpp \ |
407 | - debughelpers.cpp \ |
408 | - timer.cpp \ |
409 | - timesource.cpp \ |
410 | - touchownershipevent.cpp \ |
411 | - touchregistry.cpp \ |
412 | - unownedtouchevent.cpp \ |
413 | - ucswipearea.cpp \ |
414 | - damper.cpp \ |
415 | - ubuntugesturesmodule.cpp |
416 | - |
417 | |
418 | === modified file 'src/UbuntuGestures/candidateinactivitytimer.cpp' |
419 | --- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp 2016-07-06 11:27:11 +0000 |
420 | +++ src/UbuntuGestures/candidateinactivitytimer.cpp 2016-09-17 11:46:32 +0000 |
421 | @@ -14,7 +14,7 @@ |
422 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
423 | */ |
424 | |
425 | -#include <UbuntuGestures/private/candidateinactivitytimer_p.h> |
426 | +#include "candidateinactivitytimer_p.h" |
427 | |
428 | UG_NAMESPACE_BEGIN |
429 | |
430 | |
431 | === modified file 'src/UbuntuGestures/candidateinactivitytimer_p.h' |
432 | --- src/Ubuntu/UbuntuGestures/candidateinactivitytimer_p.h 2016-08-09 07:12:07 +0000 |
433 | +++ src/UbuntuGestures/candidateinactivitytimer_p.h 2016-09-17 11:46:32 +0000 |
434 | @@ -14,15 +14,15 @@ |
435 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
436 | */ |
437 | |
438 | -#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H |
439 | -#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H |
440 | - |
441 | -#include <QObject> |
442 | +#ifndef CANDIDATEINACTIVITYTIMER_P_H |
443 | +#define CANDIDATEINACTIVITYTIMER_P_H |
444 | + |
445 | +#include <QtCore/QObject> |
446 | + |
447 | +#include <UbuntuGestures/private/timer_p.h> |
448 | |
449 | class QQuickItem; |
450 | |
451 | -#include <UbuntuGestures/private/timer_p.h> |
452 | - |
453 | UG_NAMESPACE_BEGIN |
454 | |
455 | class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject { |
456 | @@ -48,4 +48,4 @@ |
457 | |
458 | UG_NAMESPACE_END |
459 | |
460 | -#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H |
461 | +#endif // CANDIDATEINACTIVITYTIMER_P_H |
462 | |
463 | === modified file 'src/UbuntuGestures/damper.cpp' |
464 | --- src/Ubuntu/UbuntuGestures/damper.cpp 2015-12-17 15:23:26 +0000 |
465 | +++ src/UbuntuGestures/damper.cpp 2016-09-17 11:46:32 +0000 |
466 | @@ -15,7 +15,8 @@ |
467 | */ |
468 | |
469 | #include "damper_p.h" |
470 | -#include <QDebug> |
471 | + |
472 | +#include <QtCore/QDebug> |
473 | |
474 | QDebug operator<<(QDebug dbg, const DampedPointF &p) |
475 | { |
476 | |
477 | === modified file 'src/UbuntuGestures/damper_p.h' |
478 | --- src/Ubuntu/UbuntuGestures/damper_p.h 2015-12-17 15:23:26 +0000 |
479 | +++ src/UbuntuGestures/damper_p.h 2016-09-17 11:46:32 +0000 |
480 | @@ -14,8 +14,8 @@ |
481 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
482 | */ |
483 | |
484 | -#ifndef UBUNTU_GESTURES_DAMPER_H |
485 | -#define UBUNTU_GESTURES_DAMPER_H |
486 | +#ifndef DAMPER_P_H |
487 | +#define DAMPER_P_H |
488 | |
489 | #include <QtCore/QPointF> |
490 | |
491 | @@ -86,4 +86,4 @@ |
492 | |
493 | QDebug operator<<(QDebug dbg, const DampedPointF &p); |
494 | |
495 | -#endif // UBUNTU_GESTURES_DAMPER_H |
496 | +#endif // DAMPER_P_H |
497 | |
498 | === modified file 'src/UbuntuGestures/debughelpers.cpp' |
499 | --- src/Ubuntu/UbuntuGestures/debughelpers.cpp 2016-07-06 11:27:11 +0000 |
500 | +++ src/UbuntuGestures/debughelpers.cpp 2016-09-17 11:46:32 +0000 |
501 | @@ -14,9 +14,10 @@ |
502 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
503 | */ |
504 | |
505 | -#include <UbuntuGestures/private/debughelpers_p.h> |
506 | -#include <QTouchEvent> |
507 | -#include <QMouseEvent> |
508 | +#include "debughelpers_p.h" |
509 | + |
510 | +#include <QtGui/QMouseEvent> |
511 | +#include <QtGui/QTouchEvent> |
512 | |
513 | QString touchPointStateToString(Qt::TouchPointState state) |
514 | { |
515 | |
516 | === modified file 'src/UbuntuGestures/debughelpers_p.h' |
517 | --- src/Ubuntu/UbuntuGestures/debughelpers_p.h 2016-08-09 07:12:07 +0000 |
518 | +++ src/UbuntuGestures/debughelpers_p.h 2016-09-17 11:46:32 +0000 |
519 | @@ -14,12 +14,10 @@ |
520 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
521 | */ |
522 | |
523 | -#ifndef UBUNTUGESTURES_DEBUG_HELPER_H |
524 | -#define UBUNTUGESTURES_DEBUG_HELPER_H |
525 | - |
526 | -#include <QString> |
527 | - |
528 | -#include "ubuntugesturesglobal.h" |
529 | +#ifndef DEBUGHELPERS_P_H |
530 | +#define DEBUGHELPERS_P_H |
531 | + |
532 | +#include <QtCore/QString> |
533 | |
534 | class QMouseEvent; |
535 | class QTouchEvent; |
536 | @@ -28,4 +26,4 @@ |
537 | QString touchEventToString(const QTouchEvent *ev); |
538 | QString mouseEventToString(const QMouseEvent *ev); |
539 | |
540 | -#endif // UBUNTUGESTURES_DEBUG_HELPER_H |
541 | +#endif // DEBUGHELPERS_P_H |
542 | |
543 | === modified file 'src/UbuntuGestures/pool_p.h' |
544 | --- src/Ubuntu/UbuntuGestures/pool_p.h 2016-08-09 07:12:07 +0000 |
545 | +++ src/UbuntuGestures/pool_p.h 2016-09-17 11:46:32 +0000 |
546 | @@ -14,12 +14,12 @@ |
547 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
548 | */ |
549 | |
550 | -#ifndef UBUNTUGESTURES_POOL_H |
551 | -#define UBUNTUGESTURES_POOL_H |
552 | - |
553 | -#include <QVector> |
554 | - |
555 | -#include "ubuntugesturesglobal.h" |
556 | +#ifndef POOL_P_H |
557 | +#define POOL_P_H |
558 | + |
559 | +#include <QtCore/QVector> |
560 | + |
561 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
562 | |
563 | /* |
564 | An object pool. |
565 | @@ -129,4 +129,4 @@ |
566 | int m_lastUsedIndex; |
567 | }; |
568 | |
569 | -#endif // UBUNTUGESTURES_POOL_H |
570 | +#endif // POOL_P_H |
571 | |
572 | === modified file 'src/UbuntuGestures/timer.cpp' |
573 | --- src/Ubuntu/UbuntuGestures/timer.cpp 2016-07-25 14:02:18 +0000 |
574 | +++ src/UbuntuGestures/timer.cpp 2016-09-17 11:46:32 +0000 |
575 | @@ -14,7 +14,7 @@ |
576 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
577 | */ |
578 | |
579 | -#include <UbuntuGestures/private/timer_p.h> |
580 | +#include "timer_p.h" |
581 | |
582 | UG_NAMESPACE_BEGIN |
583 | |
584 | |
585 | === modified file 'src/UbuntuGestures/timer_p.h' |
586 | --- src/Ubuntu/UbuntuGestures/timer_p.h 2016-08-09 07:12:07 +0000 |
587 | +++ src/UbuntuGestures/timer_p.h 2016-09-17 11:46:32 +0000 |
588 | @@ -14,16 +14,16 @@ |
589 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
590 | */ |
591 | |
592 | -#ifndef UBUNTUGESTURES_TIMER_H |
593 | -#define UBUNTUGESTURES_TIMER_H |
594 | - |
595 | -#include "ubuntugesturesglobal.h" |
596 | +#ifndef TIMER_P_H |
597 | +#define TIMER_P_H |
598 | + |
599 | +#include <QtCore/QObject> |
600 | +#include <QtCore/QPointer> |
601 | +#include <QtCore/QTimer> |
602 | + |
603 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
604 | #include <UbuntuGestures/private/timesource_p.h> |
605 | |
606 | -#include <QObject> |
607 | -#include <QPointer> |
608 | -#include <QTimer> |
609 | - |
610 | UG_NAMESPACE_BEGIN |
611 | |
612 | /* Defines an interface for a Timer. */ |
613 | @@ -114,4 +114,4 @@ |
614 | |
615 | UG_NAMESPACE_END |
616 | |
617 | -#endif // UBUNTUGESTURES_TIMER_H |
618 | +#endif // TIMER_P_H |
619 | |
620 | === modified file 'src/UbuntuGestures/timesource.cpp' |
621 | --- src/Ubuntu/UbuntuGestures/timesource.cpp 2016-07-25 14:02:18 +0000 |
622 | +++ src/UbuntuGestures/timesource.cpp 2016-09-17 11:46:32 +0000 |
623 | @@ -16,9 +16,9 @@ |
624 | * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com> |
625 | */ |
626 | |
627 | -#include <UbuntuGestures/private/timesource_p.h> |
628 | +#include "timesource_p.h" |
629 | |
630 | -#include <QElapsedTimer> |
631 | +#include <QtCore/QElapsedTimer> |
632 | |
633 | UG_NAMESPACE_BEGIN |
634 | |
635 | |
636 | === modified file 'src/UbuntuGestures/timesource_p.h' |
637 | --- src/Ubuntu/UbuntuGestures/timesource_p.h 2016-08-09 07:12:07 +0000 |
638 | +++ src/UbuntuGestures/timesource_p.h 2016-09-17 11:46:32 +0000 |
639 | @@ -16,11 +16,12 @@ |
640 | * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com> |
641 | */ |
642 | |
643 | -#ifndef UBUNTUGESTURES_TIMESOURCE_H |
644 | -#define UBUNTUGESTURES_TIMESOURCE_H |
645 | - |
646 | -#include "ubuntugesturesglobal.h" |
647 | -#include <QSharedPointer> |
648 | +#ifndef TIMESOURCE_P_H |
649 | +#define TIMESOURCE_P_H |
650 | + |
651 | +#include <QtCore/QSharedPointer> |
652 | + |
653 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
654 | |
655 | UG_NAMESPACE_BEGIN |
656 | /* |
657 | @@ -59,4 +60,4 @@ |
658 | |
659 | UG_NAMESPACE_END |
660 | |
661 | -#endif // UBUNTUGESTURES_TIMESOURCE_H |
662 | +#endif // TIMESOURCE_P_H |
663 | |
664 | === modified file 'src/UbuntuGestures/touchownershipevent.cpp' |
665 | --- src/Ubuntu/UbuntuGestures/touchownershipevent.cpp 2016-07-06 11:27:11 +0000 |
666 | +++ src/UbuntuGestures/touchownershipevent.cpp 2016-09-17 11:46:32 +0000 |
667 | @@ -14,7 +14,7 @@ |
668 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
669 | */ |
670 | |
671 | -#include <UbuntuGestures/private/touchownershipevent_p.h> |
672 | +#include "touchownershipevent_p.h" |
673 | |
674 | UG_NAMESPACE_BEGIN |
675 | |
676 | |
677 | === modified file 'src/UbuntuGestures/touchownershipevent_p.h' |
678 | --- src/Ubuntu/UbuntuGestures/touchownershipevent_p.h 2016-08-09 07:12:07 +0000 |
679 | +++ src/UbuntuGestures/touchownershipevent_p.h 2016-09-17 11:46:32 +0000 |
680 | @@ -14,11 +14,12 @@ |
681 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
682 | */ |
683 | |
684 | -#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H |
685 | -#define UBUNTU_TOUCHOWNERSHIPEVENT_H |
686 | - |
687 | -#include <QEvent> |
688 | -#include "ubuntugesturesglobal.h" |
689 | +#ifndef TOUCHOWNERSHIPEVENT_P_H |
690 | +#define TOUCHOWNERSHIPEVENT_P_H |
691 | + |
692 | +#include <QtCore/QEvent> |
693 | + |
694 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
695 | |
696 | UG_NAMESPACE_BEGIN |
697 | /* |
698 | @@ -50,4 +51,4 @@ |
699 | |
700 | UG_NAMESPACE_END |
701 | |
702 | -#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H |
703 | +#endif // TOUCHOWNERSHIPEVENT_P_H |
704 | |
705 | === modified file 'src/UbuntuGestures/touchregistry.cpp' |
706 | --- src/Ubuntu/UbuntuGestures/touchregistry.cpp 2016-07-06 11:27:11 +0000 |
707 | +++ src/UbuntuGestures/touchregistry.cpp 2016-09-17 11:46:32 +0000 |
708 | @@ -14,21 +14,20 @@ |
709 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
710 | */ |
711 | |
712 | -#include <UbuntuGestures/private/touchregistry_p.h> |
713 | - |
714 | -#include <QCoreApplication> |
715 | -#include <QDebug> |
716 | - |
717 | -#include <private/qquickitem_p.h> |
718 | - |
719 | -#include <UbuntuGestures/private/candidateinactivitytimer_p.h> |
720 | -#include <UbuntuGestures/private/timer_p.h> |
721 | -#include <UbuntuGestures/private/touchownershipevent_p.h> |
722 | -#include <UbuntuGestures/private/unownedtouchevent_p.h> |
723 | +#include "touchregistry_p.h" |
724 | + |
725 | +#include <QtCore/QCoreApplication> |
726 | +#include <QtCore/QDebug> |
727 | +#include <QtQuick/private/qquickitem_p.h> |
728 | + |
729 | +#include "candidateinactivitytimer_p.h" |
730 | +#include "debughelpers_p.h" |
731 | +#include "timer_p.h" |
732 | +#include "touchownershipevent_p.h" |
733 | +#include "unownedtouchevent_p.h" |
734 | |
735 | Q_LOGGING_CATEGORY(ugTouchRegistry, "libubuntugestures.TouchRegistry", QtMsgType::QtWarningMsg) |
736 | |
737 | -#include <UbuntuGestures/private/debughelpers_p.h> |
738 | #define UG_DEBUG qCDebug(ugTouchRegistry) << "[TouchRegistry]" |
739 | |
740 | UG_NAMESPACE_BEGIN |
741 | |
742 | === modified file 'src/UbuntuGestures/touchregistry_p.h' |
743 | --- src/Ubuntu/UbuntuGestures/touchregistry_p.h 2016-08-09 07:12:07 +0000 |
744 | +++ src/UbuntuGestures/touchregistry_p.h 2016-09-17 11:46:32 +0000 |
745 | @@ -14,23 +14,21 @@ |
746 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
747 | */ |
748 | |
749 | -#ifndef UNITY_TOUCHREGISTRY_H |
750 | -#define UNITY_TOUCHREGISTRY_H |
751 | +#ifndef TOUCHREGISTRY_P_H |
752 | +#define TOUCHREGISTRY_P_H |
753 | |
754 | +#include <QtCore/QLoggingCategory> |
755 | +#include <QtCore/QObject> |
756 | +#include <QtCore/QPointer> |
757 | +#include <QtCore/QVector> |
758 | +#include <QtGui/QTouchEvent> |
759 | #include <QtQuick/QQuickItem> |
760 | -#include <QObject> |
761 | -#include <QPointer> |
762 | -#include <QTouchEvent> |
763 | -#include <QVector> |
764 | |
765 | -#include "ubuntugesturesglobal.h" |
766 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
767 | #include <UbuntuGestures/private/candidateinactivitytimer_p.h> |
768 | #include <UbuntuGestures/private/timer_p.h> |
769 | #include <UbuntuGestures/private/pool_p.h> |
770 | |
771 | -// logging |
772 | -#include <QtCore/QLoggingCategory> |
773 | - |
774 | UG_FORWARD_DECLARE_CLASS(AbstractTimerFactory) |
775 | |
776 | /* |
777 | @@ -206,4 +204,4 @@ |
778 | |
779 | Q_DECLARE_LOGGING_CATEGORY(ugTouchRegistry) |
780 | |
781 | -#endif // UNITY_TOUCHREGISTRY_H |
782 | +#endif // TOUCHREGISTRY_P_H |
783 | |
784 | === modified file 'src/UbuntuGestures/ubuntugesturesmodule.cpp' |
785 | --- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp 2016-06-21 14:21:46 +0000 |
786 | +++ src/UbuntuGestures/ubuntugesturesmodule.cpp 2016-09-17 11:46:32 +0000 |
787 | @@ -16,10 +16,11 @@ |
788 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
789 | */ |
790 | |
791 | +#include <QtQml/QtQml> |
792 | #include <QtQml/QQmlEngine> |
793 | -#include <QtQml> |
794 | + |
795 | #include "ubuntugesturesmodule.h" |
796 | -#include <private/ucswipearea_p.h> |
797 | +#include "ucswipearea_p.h" |
798 | |
799 | UG_NAMESPACE_BEGIN |
800 | |
801 | |
802 | === modified file 'src/UbuntuGestures/ubuntugesturesmodule.h' |
803 | --- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h 2016-07-06 09:51:06 +0000 |
804 | +++ src/UbuntuGestures/ubuntugesturesmodule.h 2016-09-17 11:46:32 +0000 |
805 | @@ -19,7 +19,7 @@ |
806 | #ifndef UBUNTUGESTURESMODULE_H |
807 | #define UBUNTUGESTURESMODULE_H |
808 | |
809 | -#include <ubuntugesturesglobal.h> |
810 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
811 | |
812 | UG_NAMESPACE_BEGIN |
813 | |
814 | |
815 | === modified file 'src/UbuntuGestures/ucswipearea.cpp' |
816 | --- src/Ubuntu/UbuntuGestures/ucswipearea.cpp 2016-07-25 14:02:18 +0000 |
817 | +++ src/UbuntuGestures/ucswipearea.cpp 2016-09-17 11:46:32 +0000 |
818 | @@ -12,22 +12,19 @@ |
819 | * |
820 | * You should have received a copy of the GNU General Public License |
821 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
822 | - * |
823 | */ |
824 | |
825 | #include "ucswipearea_p_p.h" |
826 | |
827 | -#include <QQuickWindow> |
828 | -#include <QtCore/qmath.h> |
829 | -#include <QScreen> |
830 | -#include <QDebug> |
831 | - |
832 | -#include <private/qquickwindow_p.h> |
833 | - |
834 | -// local |
835 | -#include <UbuntuGestures/private/touchownershipevent_p.h> |
836 | -#include <UbuntuGestures/private/touchregistry_p.h> |
837 | -#include <UbuntuGestures/private/unownedtouchevent_p.h> |
838 | +#include <QtCore/QDebug> |
839 | +#include <QtGui/QScreen> |
840 | +#include <QtCore/QtMath> |
841 | +#include <QtQuick/QQuickWindow> |
842 | +#include <QtQuick/private/qquickwindow_p.h> |
843 | + |
844 | +#include "touchownershipevent_p.h" |
845 | +#include "touchregistry_p.h" |
846 | +#include "unownedtouchevent_p.h" |
847 | |
848 | UG_NAMESPACE_BEGIN |
849 | |
850 | |
851 | === modified file 'src/UbuntuGestures/ucswipearea_p.h' |
852 | --- src/Ubuntu/UbuntuGestures/ucswipearea_p.h 2016-07-06 11:27:11 +0000 |
853 | +++ src/UbuntuGestures/ucswipearea_p.h 2016-09-17 11:46:32 +0000 |
854 | @@ -12,22 +12,18 @@ |
855 | * |
856 | * You should have received a copy of the GNU General Public License |
857 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
858 | - * |
859 | */ |
860 | |
861 | -#ifndef UCSWIPEAREA_H |
862 | -#define UCSWIPEAREA_H |
863 | +#ifndef UCSWIPEAREA_P_H |
864 | +#define UCSWIPEAREA_P_H |
865 | |
866 | +#include <QtCore/QLoggingCategory> |
867 | #include <QtQuick/QQuickItem> |
868 | -#include "ubuntugesturesglobal.h" |
869 | |
870 | -// lib UbuntuGestures |
871 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
872 | #include <UbuntuGestures/private/pool_p.h> |
873 | #include <UbuntuGestures/private/timer_p.h> |
874 | |
875 | -// logging |
876 | -#include <QtCore/QLoggingCategory> |
877 | - |
878 | UG_NAMESPACE_BEGIN |
879 | |
880 | class TouchOwnershipEvent; |
881 | @@ -106,4 +102,4 @@ |
882 | Q_DECLARE_LOGGING_CATEGORY(ucSwipeArea) |
883 | Q_DECLARE_LOGGING_CATEGORY(ucActiveTouchInfo) |
884 | |
885 | -#endif // UCSWIPEAREA_H |
886 | +#endif // UCSWIPEAREA_P_H |
887 | |
888 | === modified file 'src/UbuntuGestures/ucswipearea_p_p.h' |
889 | --- src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h 2016-07-25 14:02:18 +0000 |
890 | +++ src/UbuntuGestures/ucswipearea_p_p.h 2016-09-17 11:46:32 +0000 |
891 | @@ -12,16 +12,16 @@ |
892 | * |
893 | * You should have received a copy of the GNU General Public License |
894 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
895 | - * |
896 | */ |
897 | |
898 | -#ifndef UCSWIPEAREAPRIVATE_H |
899 | -#define UCSWIPEAREAPRIVATE_H |
900 | - |
901 | -#include "ucswipearea_p.h" |
902 | +#ifndef UCSWIPEAREA_P_P_H |
903 | +#define UCSWIPEAREA_P_P_H |
904 | + |
905 | +#include <UbuntuGestures/private/ucswipearea_p.h> |
906 | + |
907 | #include <QtQuick/private/qquickitem_p.h> |
908 | |
909 | -#include "damper_p.h" |
910 | +#include <UbuntuGestures/private/damper_p.h> |
911 | |
912 | UG_NAMESPACE_BEGIN |
913 | |
914 | @@ -175,4 +175,4 @@ |
915 | |
916 | UG_NAMESPACE_END |
917 | |
918 | -#endif // UCSWIPEAREAPRIVATE_H |
919 | +#endif // UCSWIPEAREA_P_P_H |
920 | |
921 | === modified file 'src/UbuntuGestures/unownedtouchevent.cpp' |
922 | --- src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp 2016-07-06 11:27:11 +0000 |
923 | +++ src/UbuntuGestures/unownedtouchevent.cpp 2016-09-17 11:46:32 +0000 |
924 | @@ -14,7 +14,7 @@ |
925 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
926 | */ |
927 | |
928 | -#include <UbuntuGestures/private/unownedtouchevent_p.h> |
929 | +#include "unownedtouchevent_p.h" |
930 | |
931 | UG_NAMESPACE_BEGIN |
932 | |
933 | |
934 | === modified file 'src/UbuntuGestures/unownedtouchevent_p.h' |
935 | --- src/Ubuntu/UbuntuGestures/unownedtouchevent_p.h 2016-08-09 07:12:07 +0000 |
936 | +++ src/UbuntuGestures/unownedtouchevent_p.h 2016-09-17 11:46:32 +0000 |
937 | @@ -14,12 +14,13 @@ |
938 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
939 | */ |
940 | |
941 | -#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H |
942 | -#define UBUNTU_UNOWNEDTOUCHEVENT_H |
943 | - |
944 | -#include <QTouchEvent> |
945 | -#include <QScopedPointer> |
946 | -#include "ubuntugesturesglobal.h" |
947 | +#ifndef UNOWNEDTOUCHEVENT_P_H |
948 | +#define UNOWNEDTOUCHEVENT_P_H |
949 | + |
950 | +#include <QtCore/QScopedPointer> |
951 | +#include <QtGui/QTouchEvent> |
952 | + |
953 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
954 | |
955 | UG_NAMESPACE_BEGIN |
956 | /* |
957 | @@ -45,4 +46,4 @@ |
958 | |
959 | UG_NAMESPACE_END |
960 | |
961 | -#endif // UBUNTU_UNOWNEDTOUCHEVENT_H |
962 | +#endif // UNOWNEDTOUCHEVENT_P_H |
963 | |
964 | === renamed directory 'src/Ubuntu/UbuntuMetrics' => 'src/UbuntuMetrics' |
965 | === modified file 'src/UbuntuMetrics/UbuntuMetrics.pro' |
966 | --- src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro 2016-08-04 22:54:21 +0000 |
967 | +++ src/UbuntuMetrics/UbuntuMetrics.pro 2016-09-17 11:46:32 +0000 |
968 | @@ -1,7 +1,5 @@ |
969 | -TEMPLATE=lib |
970 | -TARGET=UbuntuMetrics |
971 | -QT += core-private gui-private quick-private |
972 | -CONFIG += dll no_keywords c++11 |
973 | +TARGET = UbuntuMetrics |
974 | +QT = core-private gui-private quick-private |
975 | LIBS += -ldl |
976 | |
977 | contains(QT_CONFIG, opengles2) { |
978 | @@ -12,30 +10,26 @@ |
979 | DEFINES += LTTNG_PLUGIN_INSTALL_PATH=\\\"$$[QT_INSTALL_PLUGINS]/ubuntu/metrics/libumlttng.so\\\" |
980 | DEFINES += LTTNG_PLUGIN_BUILD_PATH=\\\"$$OUT_PWD/lttng/libumlttng.so\\\" |
981 | |
982 | -load(qt_build_config) |
983 | -load(ubuntu_qt_module) |
984 | - |
985 | -PUBLIC_HEADERS = \ |
986 | - $$PWD/ubuntumetricsglobal.h \ |
987 | - $$PWD/events.h \ |
988 | - $$PWD/logger.h \ |
989 | - $$PWD/applicationmonitor.h |
990 | - |
991 | HEADERS += \ |
992 | - $${PUBLIC_HEADERS} \ |
993 | - $$PWD/ubuntumetricsglobal_p.h \ |
994 | + $$PWD/applicationmonitor.h \ |
995 | + $$PWD/applicationmonitor_p.h \ |
996 | + $$PWD/bitmaptext_p.h \ |
997 | $$PWD/bitmaptextfont_p.h \ |
998 | + $$PWD/events.h \ |
999 | $$PWD/events_p.h \ |
1000 | + $$PWD/gputimer_p.h \ |
1001 | + $$PWD/logger.h \ |
1002 | $$PWD/logger_p.h \ |
1003 | - $$PWD/gputimer_p.h \ |
1004 | - $$PWD/bitmaptext_p.h \ |
1005 | $$PWD/overlay_p.h \ |
1006 | - $$PWD/applicationmonitor_p.h |
1007 | + $$PWD/ubuntumetricsglobal.h \ |
1008 | + $$PWD/ubuntumetricsglobal_p.h \ |
1009 | |
1010 | SOURCES += \ |
1011 | + $$PWD/applicationmonitor.cpp \ |
1012 | + $$PWD/bitmaptext.cpp \ |
1013 | $$PWD/events.cpp \ |
1014 | + $$PWD/gputimer.cpp \ |
1015 | $$PWD/logger.cpp \ |
1016 | - $$PWD/gputimer.cpp \ |
1017 | - $$PWD/bitmaptext.cpp \ |
1018 | - $$PWD/overlay.cpp \ |
1019 | - $$PWD/applicationmonitor.cpp |
1020 | + $$PWD/overlay.cpp |
1021 | + |
1022 | +load(ubuntu_qt_module) |
1023 | |
1024 | === modified file 'src/UbuntuMetrics/applicationmonitor.cpp' |
1025 | --- src/Ubuntu/UbuntuMetrics/applicationmonitor.cpp 2016-08-22 06:18:26 +0000 |
1026 | +++ src/UbuntuMetrics/applicationmonitor.cpp 2016-09-17 11:46:32 +0000 |
1027 | @@ -16,6 +16,7 @@ |
1028 | // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>. |
1029 | |
1030 | #include "applicationmonitor_p.h" |
1031 | + |
1032 | #include <QtCore/QTimer> |
1033 | #include <QtGui/QGuiApplication> |
1034 | #include <QtQuick/QQuickWindow> |
1035 | |
1036 | === modified file 'src/UbuntuMetrics/applicationmonitor.h' |
1037 | --- src/Ubuntu/UbuntuMetrics/applicationmonitor.h 2016-08-05 00:11:54 +0000 |
1038 | +++ src/UbuntuMetrics/applicationmonitor.h 2016-09-17 11:46:32 +0000 |
1039 | @@ -18,10 +18,11 @@ |
1040 | #ifndef APPLICATIONMONITOR_H |
1041 | #define APPLICATIONMONITOR_H |
1042 | |
1043 | -#include <UbuntuMetrics/ubuntumetricsglobal.h> |
1044 | +#include <QtCore/QList> |
1045 | + |
1046 | #include <UbuntuMetrics/logger.h> |
1047 | #include <UbuntuMetrics/events.h> |
1048 | -#include <QtCore/QList> |
1049 | +#include <UbuntuMetrics/ubuntumetricsglobal.h> |
1050 | |
1051 | class UMApplicationMonitorPrivate; |
1052 | |
1053 | |
1054 | === modified file 'src/UbuntuMetrics/applicationmonitor_p.h' |
1055 | --- src/Ubuntu/UbuntuMetrics/applicationmonitor_p.h 2016-08-05 15:07:39 +0000 |
1056 | +++ src/UbuntuMetrics/applicationmonitor_p.h 2016-09-17 11:46:32 +0000 |
1057 | @@ -18,10 +18,8 @@ |
1058 | #ifndef APPLICATIONMONITOR_P_H |
1059 | #define APPLICATIONMONITOR_P_H |
1060 | |
1061 | -#include "applicationmonitor.h" |
1062 | -#include "overlay_p.h" |
1063 | -#include "gputimer_p.h" |
1064 | -#include "ubuntumetricsglobal_p.h" |
1065 | +#include <UbuntuMetrics/applicationmonitor.h> |
1066 | + |
1067 | #include <QtCore/QTimer> |
1068 | #include <QtCore/QThread> |
1069 | #include <QtCore/QMutex> |
1070 | @@ -30,6 +28,10 @@ |
1071 | #include <QtCore/QRunnable> |
1072 | #include <QtCore/QAtomicInteger> |
1073 | |
1074 | +#include <UbuntuMetrics/private/overlay_p.h> |
1075 | +#include <UbuntuMetrics/private/gputimer_p.h> |
1076 | +#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h> |
1077 | + |
1078 | class LoggingThread; |
1079 | class WindowMonitor; |
1080 | class QQuickWindow; |
1081 | |
1082 | === modified file 'src/UbuntuMetrics/bitmaptext.cpp' |
1083 | --- src/Ubuntu/UbuntuMetrics/bitmaptext.cpp 2016-08-19 03:35:49 +0000 |
1084 | +++ src/UbuntuMetrics/bitmaptext.cpp 2016-09-17 11:46:32 +0000 |
1085 | @@ -16,12 +16,14 @@ |
1086 | // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>. |
1087 | |
1088 | #include <math.h> |
1089 | + |
1090 | +#include <QtCore/QtGlobal> |
1091 | +#include <QtCore/QPoint> |
1092 | +#include <QtCore/QSize> |
1093 | + |
1094 | #include "bitmaptext_p.h" |
1095 | #include "bitmaptextfont_p.h" |
1096 | #include "ubuntumetricsglobal_p.h" |
1097 | -#include <QtCore/QtGlobal> |
1098 | -#include <QtCore/QSize> |
1099 | -#include <QtCore/QPoint> |
1100 | |
1101 | static const GLchar* bitmapTextVertexShaderSource = |
1102 | #if !defined(QT_OPENGL_ES_2) |
1103 | |
1104 | === modified file 'src/UbuntuMetrics/bitmaptext_p.h' |
1105 | --- src/Ubuntu/UbuntuMetrics/bitmaptext_p.h 2016-08-05 15:07:39 +0000 |
1106 | +++ src/UbuntuMetrics/bitmaptext_p.h 2016-09-17 11:46:32 +0000 |
1107 | @@ -18,9 +18,10 @@ |
1108 | #ifndef BITMAPTEXT_P_H |
1109 | #define BITMAPTEXT_P_H |
1110 | |
1111 | -#include "ubuntumetricsglobal_p.h" |
1112 | #include <QtGui/QOpenGLFunctions> |
1113 | |
1114 | +#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h> |
1115 | + |
1116 | // BitmapText renders a monospaced bitmap Latin-1 encoded text (128 characters) |
1117 | // stored in a single texture atlas using OpenGL. The font is generated by |
1118 | // bitmap-text-builder and stored in the bitmaptextfont_p.h header. |
1119 | |
1120 | === modified file 'src/UbuntuMetrics/events.cpp' |
1121 | --- src/Ubuntu/UbuntuMetrics/events.cpp 2016-08-18 17:42:55 +0000 |
1122 | +++ src/UbuntuMetrics/events.cpp 2016-09-17 11:46:32 +0000 |
1123 | @@ -16,12 +16,15 @@ |
1124 | // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>. |
1125 | |
1126 | #include "events_p.h" |
1127 | -#include "ubuntumetricsglobal_p.h" |
1128 | -#include <QtCore/QElapsedTimer> |
1129 | + |
1130 | #include <string.h> |
1131 | #include <unistd.h> |
1132 | #include <fcntl.h> |
1133 | -#include <cstdio> |
1134 | +#include <stdio.h> |
1135 | + |
1136 | +#include <QtCore/QElapsedTimer> |
1137 | + |
1138 | +#include "ubuntumetricsglobal_p.h" |
1139 | |
1140 | const int bufferSize = 128; |
1141 | const int bufferAlignment = 64; |
1142 | |
1143 | === modified file 'src/UbuntuMetrics/events_p.h' |
1144 | --- src/Ubuntu/UbuntuMetrics/events_p.h 2016-08-05 15:07:39 +0000 |
1145 | +++ src/UbuntuMetrics/events_p.h 2016-09-17 11:46:32 +0000 |
1146 | @@ -18,10 +18,13 @@ |
1147 | #ifndef EVENTS_P_H |
1148 | #define EVENTS_P_H |
1149 | |
1150 | -#include "events.h" |
1151 | -#include "ubuntumetricsglobal_p.h" |
1152 | +#include <UbuntuMetrics/events.h> |
1153 | + |
1154 | +#include <sys/times.h> |
1155 | + |
1156 | #include <QtCore/QElapsedTimer> |
1157 | -#include <sys/times.h> |
1158 | + |
1159 | +#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h> |
1160 | |
1161 | class UBUNTU_METRICS_PRIVATE_EXPORT EventUtilsPrivate |
1162 | { |
1163 | |
1164 | === modified file 'src/UbuntuMetrics/gputimer.cpp' |
1165 | --- src/Ubuntu/UbuntuMetrics/gputimer.cpp 2016-07-26 13:41:18 +0000 |
1166 | +++ src/UbuntuMetrics/gputimer.cpp 2016-09-17 11:46:32 +0000 |
1167 | @@ -16,8 +16,10 @@ |
1168 | // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>. |
1169 | |
1170 | #include "gputimer_p.h" |
1171 | + |
1172 | +#include <QtCore/QElapsedTimer> |
1173 | + |
1174 | #include "ubuntumetricsglobal_p.h" |
1175 | -#include <QtCore/QElapsedTimer> |
1176 | |
1177 | #if !defined(QT_OPENGL_ES) && !defined(GL_TIME_ELAPSED) |
1178 | #define GL_TIME_ELAPSED 0x88BF // For GL_EXT_timer_query. |
1179 | |
1180 | === modified file 'src/UbuntuMetrics/gputimer_p.h' |
1181 | --- src/Ubuntu/UbuntuMetrics/gputimer_p.h 2016-08-05 15:07:39 +0000 |
1182 | +++ src/UbuntuMetrics/gputimer_p.h 2016-09-17 11:46:32 +0000 |
1183 | @@ -18,13 +18,15 @@ |
1184 | #ifndef GPUTIMER_P_H |
1185 | #define GPUTIMER_P_H |
1186 | |
1187 | -#include "ubuntumetricsglobal_p.h" |
1188 | #include <QtGui/QOpenGLFunctions> |
1189 | + |
1190 | #if defined(QT_OPENGL_ES) |
1191 | #include <EGL/egl.h> |
1192 | #include <EGL/eglext.h> |
1193 | #endif |
1194 | |
1195 | +#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h> |
1196 | + |
1197 | // GPUTimer is used to measure the amount of time taken by the GPU to fully |
1198 | // complete a set of graphics commands. As opposed to a basic timer which would |
1199 | // determine the time taken by the graphics driver to push the graphics commands |
1200 | |
1201 | === modified file 'src/UbuntuMetrics/logger.cpp' |
1202 | --- src/Ubuntu/UbuntuMetrics/logger.cpp 2016-08-06 00:54:30 +0000 |
1203 | +++ src/UbuntuMetrics/logger.cpp 2016-09-17 11:46:32 +0000 |
1204 | @@ -16,13 +16,14 @@ |
1205 | // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>. |
1206 | |
1207 | #include "logger_p.h" |
1208 | -#include "ubuntumetricsglobal_p.h" |
1209 | -#include "events.h" |
1210 | + |
1211 | +#include <dlfcn.h> |
1212 | + |
1213 | #include <QtCore/QDir> |
1214 | #include <QtCore/QTime> |
1215 | |
1216 | -// LTTng shared object runtime loading. |
1217 | -#include <dlfcn.h> |
1218 | +#include "events.h" |
1219 | +#include "ubuntumetricsglobal_p.h" |
1220 | #define TRACEPOINT_DEFINE |
1221 | #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE |
1222 | #include "lttng/lttng_p.h" |
1223 | |
1224 | === modified file 'src/UbuntuMetrics/logger.h' |
1225 | --- src/Ubuntu/UbuntuMetrics/logger.h 2016-08-04 22:54:21 +0000 |
1226 | +++ src/UbuntuMetrics/logger.h 2016-09-17 11:46:32 +0000 |
1227 | @@ -18,8 +18,9 @@ |
1228 | #ifndef LOGGER_H |
1229 | #define LOGGER_H |
1230 | |
1231 | +#include <QtCore/QFile> |
1232 | + |
1233 | #include <UbuntuMetrics/ubuntumetricsglobal.h> |
1234 | -#include <QtCore/QFile> |
1235 | |
1236 | class UMEvent; |
1237 | class UMFileLoggerPrivate; |
1238 | |
1239 | === modified file 'src/UbuntuMetrics/logger_p.h' |
1240 | --- src/Ubuntu/UbuntuMetrics/logger_p.h 2016-08-05 15:07:39 +0000 |
1241 | +++ src/UbuntuMetrics/logger_p.h 2016-09-17 11:46:32 +0000 |
1242 | @@ -18,12 +18,14 @@ |
1243 | #ifndef LOGGER_P_H |
1244 | #define LOGGER_P_H |
1245 | |
1246 | -#include "logger.h" |
1247 | -#include "ubuntumetricsglobal_p.h" |
1248 | -#include "events.h" |
1249 | +#include <UbuntuMetrics/logger.h> |
1250 | + |
1251 | #include <QtCore/QFile> |
1252 | #include <QtCore/QTextStream> |
1253 | |
1254 | +#include <UbuntuMetrics/events.h> |
1255 | +#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h> |
1256 | + |
1257 | class UBUNTU_METRICS_PRIVATE_EXPORT UMFileLoggerPrivate |
1258 | { |
1259 | public: |
1260 | |
1261 | === modified file 'src/UbuntuMetrics/overlay.cpp' |
1262 | --- src/Ubuntu/UbuntuMetrics/overlay.cpp 2016-07-26 13:41:18 +0000 |
1263 | +++ src/UbuntuMetrics/overlay.cpp 2016-09-17 11:46:32 +0000 |
1264 | @@ -16,11 +16,14 @@ |
1265 | // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>. |
1266 | |
1267 | #include "overlay_p.h" |
1268 | -#include "ubuntumetricsglobal_p.h" |
1269 | + |
1270 | +#include <unistd.h> |
1271 | +#include <fcntl.h> |
1272 | + |
1273 | #include <QtCore/QSysInfo> |
1274 | #include <QtGui/QGuiApplication> |
1275 | -#include <unistd.h> |
1276 | -#include <fcntl.h> |
1277 | + |
1278 | +#include "ubuntumetricsglobal_p.h" |
1279 | |
1280 | static const QPointF position = QPointF(5.0f, 5.0f); |
1281 | static const float opacity = 0.85f; |
1282 | |
1283 | === modified file 'src/UbuntuMetrics/overlay_p.h' |
1284 | --- src/Ubuntu/UbuntuMetrics/overlay_p.h 2016-08-05 15:07:39 +0000 |
1285 | +++ src/UbuntuMetrics/overlay_p.h 2016-09-17 11:46:32 +0000 |
1286 | @@ -18,11 +18,12 @@ |
1287 | #ifndef OVERLAY_P_H |
1288 | #define OVERLAY_P_H |
1289 | |
1290 | -#include "ubuntumetricsglobal_p.h" |
1291 | -#include "bitmaptext_p.h" |
1292 | -#include "events.h" |
1293 | #include <QtCore/QSize> |
1294 | |
1295 | +#include <UbuntuMetrics/events.h> |
1296 | +#include <UbuntuMetrics/private/bitmaptext_p.h> |
1297 | +#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h> |
1298 | + |
1299 | #if !defined QT_NO_DEBUG |
1300 | class QOpenGLContext; |
1301 | #endif |
1302 | |
1303 | === modified file 'src/UbuntuMetrics/ubuntumetricsglobal.h' |
1304 | --- src/Ubuntu/UbuntuMetrics/ubuntumetricsglobal.h 2016-07-22 10:47:24 +0000 |
1305 | +++ src/UbuntuMetrics/ubuntumetricsglobal.h 2016-09-17 11:46:32 +0000 |
1306 | @@ -18,7 +18,7 @@ |
1307 | #ifndef UBUNTUMETRICSGLOBAL_H |
1308 | #define UBUNTUMETRICSGLOBAL_H |
1309 | |
1310 | -#include <QtCore/qglobal.h> |
1311 | +#include <QtCore/QtGlobal> |
1312 | |
1313 | #if defined(QT_BUILD_UBUNTUMETRICS_LIB) |
1314 | #define UBUNTU_METRICS_EXPORT Q_DECL_EXPORT |
1315 | |
1316 | === modified file 'src/UbuntuMetrics/ubuntumetricsglobal_p.h' |
1317 | --- src/Ubuntu/UbuntuMetrics/ubuntumetricsglobal_p.h 2016-08-04 16:50:30 +0000 |
1318 | +++ src/UbuntuMetrics/ubuntumetricsglobal_p.h 2016-09-17 11:46:32 +0000 |
1319 | @@ -18,7 +18,7 @@ |
1320 | #ifndef UBUNTUMETRICSGLOBAL_P_H |
1321 | #define UBUNTUMETRICSGLOBAL_P_H |
1322 | |
1323 | -#include "ubuntumetricsglobal.h" |
1324 | +#include <UbuntuMetrics/ubuntumetricsglobal.h> |
1325 | |
1326 | // Logging macros, debug macros are compiled out for release builds. |
1327 | #define LOG(...) qDebug(__VA_ARGS__) |
1328 | |
1329 | === renamed directory 'src/Ubuntu/UbuntuToolkit' => 'src/UbuntuToolkit' |
1330 | === modified file 'src/UbuntuToolkit/UbuntuToolkit.pro' |
1331 | --- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro 2016-08-26 12:03:35 +0000 |
1332 | +++ src/UbuntuToolkit/UbuntuToolkit.pro 2016-09-17 11:46:32 +0000 |
1333 | @@ -1,255 +1,231 @@ |
1334 | -TEMPLATE=lib |
1335 | -TARGET=UbuntuToolkit |
1336 | - |
1337 | -QT *= core-private gui-private qml qml-private quick quick-private testlib |
1338 | +TARGET = UbuntuToolkit |
1339 | +QT = core-private gui-private qml-private quick-private testlib dbus svg organizer \ |
1340 | + UbuntuGestures-private UbuntuMetrics |
1341 | |
1342 | unix { |
1343 | CONFIG += link_pkgconfig |
1344 | PKGCONFIG += gio-2.0 dbus-1 libnih libnih-dbus |
1345 | } |
1346 | -QT *= dbus svg UbuntuGestures UbuntuGestures_private UbuntuMetrics |
1347 | - |
1348 | -# QOrganizer for Alarm API |
1349 | -QT *= organizer |
1350 | |
1351 | !contains(QT_ARCH, arm) { |
1352 | DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION |
1353 | LIBS += -lX11 -lxcb -lXi |
1354 | - |
1355 | SOURCES += mousetouchadaptor_x11.cpp |
1356 | } |
1357 | |
1358 | -CONFIG += dll no_keywords c++11 |
1359 | - |
1360 | -INCLUDEPATH+=$$PWD |
1361 | - |
1362 | DEFINES += UBUNTUTOOLKIT_LIBRARY |
1363 | -#comment in the following line to disable traces |
1364 | -#DEFINES += QT_NO_DEBUG_OUTPUT |
1365 | -DEFINES += QT_USE_QSTRINGBUILDER |
1366 | - |
1367 | -load(qt_build_config) |
1368 | -load(ubuntu_qt_module) |
1369 | - |
1370 | -QMAKE_CXXFLAGS -= -Werror=deprecated-declarations |
1371 | -DEFINES -= QT_DEPRECATED_WARNINGS |
1372 | -DEFINES -= QT_ASCII_CAST_WARNINGS |
1373 | - |
1374 | -HEADERS += \ |
1375 | - colorutils_p.h \ |
1376 | - ubuntutoolkitglobal.h \ |
1377 | - tree_p.h \ |
1378 | - asyncloader_p.h \ |
1379 | - asyncloader_p_p.h \ |
1380 | - mousetouchadaptor_p.h \ |
1381 | - mousetouchadaptor_p_p.h \ |
1382 | - propertychange_p.h \ |
1383 | - ubuntutoolkitmodule.h \ |
1384 | - splitview_p.h \ |
1385 | - splitview_p_p.h \ |
1386 | - privates/splitviewhandler_p_p.h \ |
1387 | - menu_p_p.h \ |
1388 | - menubar_p_p.h \ |
1389 | - menu_p.h \ |
1390 | - menubar_p.h \ |
1391 | - menugroup_p.h |
1392 | - |
1393 | -SOURCES += \ |
1394 | - colorutils.cpp \ |
1395 | - tree.cpp \ |
1396 | - asyncloader.cpp \ |
1397 | - mousetouchadaptor.cpp \ |
1398 | - propertychange.cpp \ |
1399 | - ubuntutoolkitmodule.cpp \ |
1400 | - splitview.cpp \ |
1401 | - privates/splitviewhandler.cpp \ |
1402 | - splitviewlayout.cpp \ |
1403 | - menu.cpp \ |
1404 | - menubar.cpp \ |
1405 | - menugroup.cpp |
1406 | - |
1407 | -HEADERS += \ |
1408 | - uctheme_p.h \ |
1409 | - i18n_p.h \ |
1410 | - listener_p.h \ |
1411 | - ucscalingimageprovider_p.h \ |
1412 | - ucunits_p.h \ |
1413 | - ucqquickimageextension_p.h \ |
1414 | - quickutils_p.h \ |
1415 | - ucubuntushapetextures_p.h \ |
1416 | - ucubuntushape_p.h \ |
1417 | - ucubuntushapeoverlay_p.h \ |
1418 | - ucproportionalshape_p.h \ |
1419 | - inversemouseareatype_p.h \ |
1420 | - qquickclipboard_p.h \ |
1421 | - qquickmimedata_p.h \ |
1422 | - qquickclipboard_p_p.h \ |
1423 | - ucubuntuanimation_p.h \ |
1424 | - ucfontutils_p.h \ |
1425 | - ucapplication_p.h \ |
1426 | - ucarguments_p.h \ |
1427 | - ucargument_p.h \ |
1428 | - ucalarm_p.h \ |
1429 | - ucalarm_p_p.h \ |
1430 | - alarmmanager_p_p.h \ |
1431 | - alarmmanager_p.h \ |
1432 | - ucalarmmodel_p.h \ |
1433 | - unitythemeiconprovider_p.h \ |
1434 | - adapters/alarmsadapter_p.h \ |
1435 | - ucstatesaver_p.h \ |
1436 | - sortbehavior_p.h \ |
1437 | - filterbehavior_p.h \ |
1438 | - sortfiltermodel_p.h \ |
1439 | - statesaverbackend_p.h \ |
1440 | - ucstatesaver_p_p.h \ |
1441 | - ucurihandler_p.h \ |
1442 | - ucinversemouse_p.h \ |
1443 | - ucmouse_p.h \ |
1444 | - unixsignalhandler_p.h \ |
1445 | - ucstyleditembase_p.h \ |
1446 | - ucstyleditembase_p_p.h \ |
1447 | - ucaction_p.h \ |
1448 | - ucactioncontext_p.h \ |
1449 | - ucactionmanager_p.h \ |
1450 | - adapters/actionsproxy_p.h \ |
1451 | - adapters/dbuspropertywatcher_p.h \ |
1452 | - uclistitem_p.h \ |
1453 | - uclistitem_p_p.h \ |
1454 | - uclistitemactions_p.h \ |
1455 | - uclistitemactions_p_p.h \ |
1456 | - uclistitemstyle_p.h \ |
1457 | - ucserviceproperties_p.h \ |
1458 | - ucserviceproperties_p_p.h \ |
1459 | - privates/listitemdragarea_p.h \ |
1460 | - privates/listitemdraghandler_p.h \ |
1461 | - privates/listitemselection_p.h \ |
1462 | - ucdeprecatedtheme_p.h \ |
1463 | - ucdefaulttheme_p.h \ |
1464 | - ucstylehints_p.h \ |
1465 | - ucslotslayout_p.h \ |
1466 | - ucslotslayout_p_p.h \ |
1467 | - livetimer_p.h \ |
1468 | - livetimer_p_p.h \ |
1469 | - timeutils_p.h \ |
1470 | - ucactionitem_p.h \ |
1471 | - ucactionitem_p_p.h \ |
1472 | - uchaptics_p.h \ |
1473 | - ucabstractbutton_p.h \ |
1474 | - ucabstractbutton_p_p.h \ |
1475 | - ucmargins_p.h \ |
1476 | - ucthemingextension_p.h \ |
1477 | - ucheader_p.h \ |
1478 | - uclabel_p.h \ |
1479 | - uclistitemlayout_p.h \ |
1480 | - privates/threelabelsslot_p.h \ |
1481 | - ucimportversionchecker_p.h \ |
1482 | - ucbottomedgehint_p.h \ |
1483 | - ucbottomedgehint_p_p.h \ |
1484 | - ucmathutils_p.h \ |
1485 | - ucbottomedge_p.h \ |
1486 | - ucbottomedge_p_p.h \ |
1487 | - ucbottomedgestyle_p.h \ |
1488 | - ucbottomedgeregion_p.h \ |
1489 | - ucpagetreenode_p.h \ |
1490 | - ucpagetreenode_p_p.h \ |
1491 | - ucmainviewbase_p.h \ |
1492 | - ucmainviewbase_p_p.h \ |
1493 | - ucperformancemonitor_p.h \ |
1494 | - privates/listviewextensions_p.h \ |
1495 | - privates/frame_p.h \ |
1496 | - privates/ucpagewrapper_p.h \ |
1497 | - privates/ucpagewrapper_p_p.h \ |
1498 | - privates/ucpagewrapperincubator_p.h \ |
1499 | - privates/appheaderbase_p.h \ |
1500 | - label_p.h \ |
1501 | - ucbottomedgeregion_p_p.h \ |
1502 | - privates/ucscrollbarutils_p.h \ |
1503 | - actionlist_p.h \ |
1504 | - exclusivegroup_p.h |
1505 | + |
1506 | +# Uncomment to compile out qDebug() calls. |
1507 | +# DEFINES += QT_NO_DEBUG_OUTPUT |
1508 | + |
1509 | +HEADERS += \ |
1510 | + $$PWD/actionlist_p.h \ |
1511 | + $$PWD/adapters/actionsproxy_p.h \ |
1512 | + $$PWD/adapters/alarmsadapter_p.h \ |
1513 | + $$PWD/adapters/dbuspropertywatcher_p.h \ |
1514 | + $$PWD/alarmmanager_p.h \ |
1515 | + $$PWD/alarmmanager_p_p.h \ |
1516 | + $$PWD/asyncloader_p.h \ |
1517 | + $$PWD/asyncloader_p_p.h \ |
1518 | + $$PWD/colorutils_p.h \ |
1519 | + $$PWD/exclusivegroup_p.h \ |
1520 | + $$PWD/filterbehavior_p.h \ |
1521 | + $$PWD/i18n_p.h \ |
1522 | + $$PWD/inversemouseareatype_p.h \ |
1523 | + $$PWD/label_p.h \ |
1524 | + $$PWD/listener_p.h \ |
1525 | + $$PWD/livetimer_p.h \ |
1526 | + $$PWD/livetimer_p_p.h \ |
1527 | + $$PWD/menu_p.h \ |
1528 | + $$PWD/menu_p_p.h \ |
1529 | + $$PWD/menubar_p.h \ |
1530 | + $$PWD/menubar_p_p.h \ |
1531 | + $$PWD/menugroup_p.h \ |
1532 | + $$PWD/mousetouchadaptor_p.h \ |
1533 | + $$PWD/mousetouchadaptor_p_p.h \ |
1534 | + $$PWD/privates/appheaderbase_p.h \ |
1535 | + $$PWD/privates/frame_p.h \ |
1536 | + $$PWD/privates/listitemdragarea_p.h \ |
1537 | + $$PWD/privates/listitemdraghandler_p.h \ |
1538 | + $$PWD/privates/listitemselection_p.h \ |
1539 | + $$PWD/privates/listviewextensions_p.h \ |
1540 | + $$PWD/privates/splitviewhandler_p.h \ |
1541 | + $$PWD/privates/threelabelsslot_p.h \ |
1542 | + $$PWD/privates/ucpagewrapper_p.h \ |
1543 | + $$PWD/privates/ucpagewrapper_p_p.h \ |
1544 | + $$PWD/privates/ucpagewrapperincubator_p.h \ |
1545 | + $$PWD/privates/ucscrollbarutils_p.h \ |
1546 | + $$PWD/propertychange_p.h \ |
1547 | + $$PWD/qquickclipboard_p.h \ |
1548 | + $$PWD/qquickclipboard_p_p.h \ |
1549 | + $$PWD/qquickmimedata_p.h \ |
1550 | + $$PWD/quickutils_p.h \ |
1551 | + $$PWD/sortbehavior_p.h \ |
1552 | + $$PWD/sortfiltermodel_p.h \ |
1553 | + $$PWD/splitview_p.h \ |
1554 | + $$PWD/splitview_p_p.h \ |
1555 | + $$PWD/statesaverbackend_p.h \ |
1556 | + $$PWD/timeutils_p.h \ |
1557 | + $$PWD/tree_p.h \ |
1558 | + $$PWD/ubuntutoolkitglobal.h \ |
1559 | + $$PWD/ubuntutoolkitmodule.h \ |
1560 | + $$PWD/ucabstractbutton_p.h \ |
1561 | + $$PWD/ucabstractbutton_p_p.h \ |
1562 | + $$PWD/ucaction_p.h \ |
1563 | + $$PWD/ucactioncontext_p.h \ |
1564 | + $$PWD/ucactionitem_p.h \ |
1565 | + $$PWD/ucactionitem_p_p.h \ |
1566 | + $$PWD/ucactionmanager_p.h \ |
1567 | + $$PWD/ucalarm_p.h \ |
1568 | + $$PWD/ucalarm_p_p.h \ |
1569 | + $$PWD/ucalarmmodel_p.h \ |
1570 | + $$PWD/ucapplication_p.h \ |
1571 | + $$PWD/ucargument_p.h \ |
1572 | + $$PWD/ucarguments_p.h \ |
1573 | + $$PWD/ucbottomedge_p.h \ |
1574 | + $$PWD/ucbottomedge_p_p.h \ |
1575 | + $$PWD/ucbottomedgehint_p.h \ |
1576 | + $$PWD/ucbottomedgehint_p_p.h \ |
1577 | + $$PWD/ucbottomedgeregion_p.h \ |
1578 | + $$PWD/ucbottomedgeregion_p_p.h \ |
1579 | + $$PWD/ucbottomedgestyle_p.h \ |
1580 | + $$PWD/ucdefaulttheme_p.h \ |
1581 | + $$PWD/ucdeprecatedtheme_p.h \ |
1582 | + $$PWD/ucfontutils_p.h \ |
1583 | + $$PWD/uchaptics_p.h \ |
1584 | + $$PWD/ucheader_p.h \ |
1585 | + $$PWD/ucimportversionchecker_p.h \ |
1586 | + $$PWD/ucinversemouse_p.h \ |
1587 | + $$PWD/uclabel_p.h \ |
1588 | + $$PWD/uclistitem_p.h \ |
1589 | + $$PWD/uclistitem_p_p.h \ |
1590 | + $$PWD/uclistitemactions_p.h \ |
1591 | + $$PWD/uclistitemactions_p_p.h \ |
1592 | + $$PWD/uclistitemlayout_p.h \ |
1593 | + $$PWD/uclistitemstyle_p.h \ |
1594 | + $$PWD/ucmainviewbase_p.h \ |
1595 | + $$PWD/ucmainviewbase_p_p.h \ |
1596 | + $$PWD/ucmargins_p.h \ |
1597 | + $$PWD/ucmathutils_p.h \ |
1598 | + $$PWD/ucmouse_p.h \ |
1599 | + $$PWD/ucpagetreenode_p.h \ |
1600 | + $$PWD/ucpagetreenode_p_p.h \ |
1601 | + $$PWD/ucperformancemonitor_p.h \ |
1602 | + $$PWD/ucproportionalshape_p.h \ |
1603 | + $$PWD/ucqquickimageextension_p.h \ |
1604 | + $$PWD/ucscalingimageprovider_p.h \ |
1605 | + $$PWD/ucserviceproperties_p.h \ |
1606 | + $$PWD/ucserviceproperties_p_p.h \ |
1607 | + $$PWD/ucslotslayout_p.h \ |
1608 | + $$PWD/ucslotslayout_p_p.h \ |
1609 | + $$PWD/ucstatesaver_p.h \ |
1610 | + $$PWD/ucstatesaver_p_p.h \ |
1611 | + $$PWD/ucstyleditembase_p.h \ |
1612 | + $$PWD/ucstyleditembase_p_p.h \ |
1613 | + $$PWD/ucstylehints_p.h \ |
1614 | + $$PWD/uctheme_p.h \ |
1615 | + $$PWD/ucthemingextension_p.h \ |
1616 | + $$PWD/ucubuntuanimation_p.h \ |
1617 | + $$PWD/ucubuntushape_p.h \ |
1618 | + $$PWD/ucubuntushapeoverlay_p.h \ |
1619 | + $$PWD/ucubuntushapetextures_p.h \ |
1620 | + $$PWD/ucunits_p.h \ |
1621 | + $$PWD/ucurihandler_p.h \ |
1622 | + $$PWD/unitythemeiconprovider_p.h \ |
1623 | + $$PWD/unixsignalhandler_p.h |
1624 | |
1625 | SOURCES += \ |
1626 | - uctheme.cpp \ |
1627 | - i18n.cpp \ |
1628 | - listener.cpp \ |
1629 | - ucscalingimageprovider.cpp \ |
1630 | - ucunits.cpp \ |
1631 | - ucqquickimageextension.cpp \ |
1632 | - quickutils.cpp \ |
1633 | - ucubuntushapetextures.cpp \ |
1634 | - ucubuntushape.cpp \ |
1635 | - ucubuntushapeoverlay.cpp \ |
1636 | - ucproportionalshape.cpp \ |
1637 | - inversemouseareatype.cpp \ |
1638 | - qquickclipboard.cpp \ |
1639 | - qquickmimedata.cpp \ |
1640 | - ucubuntuanimation.cpp \ |
1641 | - ucfontutils.cpp \ |
1642 | - ucapplication.cpp \ |
1643 | - ucarguments.cpp \ |
1644 | - ucargument.cpp \ |
1645 | - ucalarm.cpp \ |
1646 | - alarmmanager_p.cpp \ |
1647 | - ucalarmmodel.cpp \ |
1648 | - unitythemeiconprovider.cpp \ |
1649 | - ucstatesaver.cpp \ |
1650 | - sortbehavior.cpp \ |
1651 | - filterbehavior.cpp \ |
1652 | - sortfiltermodel.cpp \ |
1653 | - statesaverbackend_p.cpp \ |
1654 | - ucurihandler.cpp \ |
1655 | - ucmousefilters.cpp \ |
1656 | - unixsignalhandler_p.cpp \ |
1657 | - ucstyleditembase.cpp \ |
1658 | - ucaction.cpp \ |
1659 | - ucactioncontext.cpp \ |
1660 | - ucactionmanager.cpp \ |
1661 | - adapters/actionsproxy_p.cpp \ |
1662 | - adapters/dbuspropertywatcher_p.cpp \ |
1663 | - uclistitem.cpp \ |
1664 | - uclistitemactions.cpp \ |
1665 | - uclistitemstyle.cpp \ |
1666 | - ucviewitemsattached.cpp \ |
1667 | - ucserviceproperties.cpp \ |
1668 | - privates/listitemdragarea.cpp \ |
1669 | - privates/listitemdraghandler.cpp \ |
1670 | - privates/listitemexpansion.cpp \ |
1671 | - privates/listitemselection.cpp \ |
1672 | - ucdeprecatedtheme.cpp \ |
1673 | - ucdefaulttheme.cpp \ |
1674 | - ucstylehints.cpp \ |
1675 | - ucslotslayout.cpp \ |
1676 | - livetimer.cpp \ |
1677 | - livetimer_p.cpp \ |
1678 | - ucactionitem.cpp \ |
1679 | - uchaptics.cpp \ |
1680 | - ucabstractbutton.cpp \ |
1681 | - ucthemingextension.cpp \ |
1682 | - ucheader.cpp \ |
1683 | - uclabel.cpp \ |
1684 | - uclistitemlayout.cpp \ |
1685 | - privates/threelabelsslot_p.cpp \ |
1686 | - ucimportversionchecker_p.cpp \ |
1687 | - ucbottomedgehint.cpp \ |
1688 | - ucmathutils.cpp \ |
1689 | - ucbottomedge.cpp \ |
1690 | - ucbottomedgestyle.cpp \ |
1691 | - ucbottomedgeregion.cpp \ |
1692 | - ucpagetreenode.cpp \ |
1693 | - ucmainviewbase.cpp \ |
1694 | - ucperformancemonitor.cpp \ |
1695 | - privates/listviewextensions.cpp \ |
1696 | - privates/frame.cpp \ |
1697 | - privates/ucpagewrapper.cpp \ |
1698 | - privates/ucpagewrapperincubator.cpp \ |
1699 | - privates/appheaderbase.cpp \ |
1700 | - privates/ucscrollbarutils.cpp \ |
1701 | - actionlist.cpp \ |
1702 | - exclusivegroup.cpp |
1703 | - |
1704 | -# adapters |
1705 | -SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp |
1706 | - |
1707 | -#resources |
1708 | + $$PWD/actionlist.cpp \ |
1709 | + $$PWD/adapters/actionsproxy_p.cpp \ |
1710 | + $$PWD/adapters/alarmsadapter_organizer.cpp \ |
1711 | + $$PWD/adapters/dbuspropertywatcher_p.cpp \ |
1712 | + $$PWD/alarmmanager_p.cpp \ |
1713 | + $$PWD/asyncloader.cpp \ |
1714 | + $$PWD/colorutils.cpp \ |
1715 | + $$PWD/exclusivegroup.cpp \ |
1716 | + $$PWD/filterbehavior.cpp \ |
1717 | + $$PWD/i18n.cpp \ |
1718 | + $$PWD/inversemouseareatype.cpp \ |
1719 | + $$PWD/listener.cpp \ |
1720 | + $$PWD/livetimer.cpp \ |
1721 | + $$PWD/livetimer_p.cpp \ |
1722 | + $$PWD/menu.cpp \ |
1723 | + $$PWD/menubar.cpp \ |
1724 | + $$PWD/menugroup.cpp \ |
1725 | + $$PWD/mousetouchadaptor.cpp \ |
1726 | + $$PWD/privates/appheaderbase.cpp \ |
1727 | + $$PWD/privates/frame.cpp \ |
1728 | + $$PWD/privates/listitemdragarea.cpp \ |
1729 | + $$PWD/privates/listitemdraghandler.cpp \ |
1730 | + $$PWD/privates/listitemexpansion.cpp \ |
1731 | + $$PWD/privates/listitemselection.cpp \ |
1732 | + $$PWD/privates/listviewextensions.cpp \ |
1733 | + $$PWD/privates/splitviewhandler.cpp \ |
1734 | + $$PWD/privates/threelabelsslot_p.cpp \ |
1735 | + $$PWD/privates/ucpagewrapper.cpp \ |
1736 | + $$PWD/privates/ucpagewrapperincubator.cpp \ |
1737 | + $$PWD/privates/ucscrollbarutils.cpp \ |
1738 | + $$PWD/propertychange.cpp \ |
1739 | + $$PWD/qquickclipboard.cpp \ |
1740 | + $$PWD/qquickmimedata.cpp \ |
1741 | + $$PWD/quickutils.cpp \ |
1742 | + $$PWD/sortbehavior.cpp \ |
1743 | + $$PWD/sortfiltermodel.cpp \ |
1744 | + $$PWD/splitview.cpp \ |
1745 | + $$PWD/splitviewlayout.cpp \ |
1746 | + $$PWD/statesaverbackend_p.cpp \ |
1747 | + $$PWD/tree.cpp \ |
1748 | + $$PWD/ubuntutoolkitmodule.cpp \ |
1749 | + $$PWD/ucabstractbutton.cpp \ |
1750 | + $$PWD/ucaction.cpp \ |
1751 | + $$PWD/ucactioncontext.cpp \ |
1752 | + $$PWD/ucactionitem.cpp \ |
1753 | + $$PWD/ucactionmanager.cpp \ |
1754 | + $$PWD/ucalarm.cpp \ |
1755 | + $$PWD/ucalarmmodel.cpp \ |
1756 | + $$PWD/ucapplication.cpp \ |
1757 | + $$PWD/ucargument.cpp \ |
1758 | + $$PWD/ucarguments.cpp \ |
1759 | + $$PWD/ucbottomedge.cpp \ |
1760 | + $$PWD/ucbottomedgehint.cpp \ |
1761 | + $$PWD/ucbottomedgeregion.cpp \ |
1762 | + $$PWD/ucbottomedgestyle.cpp \ |
1763 | + $$PWD/ucdefaulttheme.cpp \ |
1764 | + $$PWD/ucdeprecatedtheme.cpp \ |
1765 | + $$PWD/ucfontutils.cpp \ |
1766 | + $$PWD/uchaptics.cpp \ |
1767 | + $$PWD/ucheader.cpp \ |
1768 | + $$PWD/ucimportversionchecker_p.cpp \ |
1769 | + $$PWD/uclabel.cpp \ |
1770 | + $$PWD/uclistitem.cpp \ |
1771 | + $$PWD/uclistitemactions.cpp \ |
1772 | + $$PWD/uclistitemlayout.cpp \ |
1773 | + $$PWD/uclistitemstyle.cpp \ |
1774 | + $$PWD/ucmainviewbase.cpp \ |
1775 | + $$PWD/ucmathutils.cpp \ |
1776 | + $$PWD/ucmousefilters.cpp \ |
1777 | + $$PWD/ucpagetreenode.cpp \ |
1778 | + $$PWD/ucperformancemonitor.cpp \ |
1779 | + $$PWD/ucproportionalshape.cpp \ |
1780 | + $$PWD/ucqquickimageextension.cpp \ |
1781 | + $$PWD/ucscalingimageprovider.cpp \ |
1782 | + $$PWD/ucserviceproperties.cpp \ |
1783 | + $$PWD/ucslotslayout.cpp \ |
1784 | + $$PWD/ucstatesaver.cpp \ |
1785 | + $$PWD/ucstyleditembase.cpp \ |
1786 | + $$PWD/ucstylehints.cpp \ |
1787 | + $$PWD/uctheme.cpp \ |
1788 | + $$PWD/ucthemingextension.cpp \ |
1789 | + $$PWD/ucubuntuanimation.cpp \ |
1790 | + $$PWD/ucubuntushape.cpp \ |
1791 | + $$PWD/ucubuntushapeoverlay.cpp \ |
1792 | + $$PWD/ucubuntushapetextures.cpp \ |
1793 | + $$PWD/ucunits.cpp \ |
1794 | + $$PWD/ucurihandler.cpp \ |
1795 | + $$PWD/ucviewitemsattached.cpp \ |
1796 | + $$PWD/unitythemeiconprovider.cpp \ |
1797 | + $$PWD/unixsignalhandler_p.cpp |
1798 | + |
1799 | RESOURCES += \ |
1800 | $$PWD/resources.qrc |
1801 | |
1802 | @@ -262,3 +238,8 @@ |
1803 | $$PWD/shaders/shapeoverlay_no_dfdy.frag \ |
1804 | $$PWD/privates/shaders/frame.vert \ |
1805 | $$PWD/privates/shaders/frame.frag |
1806 | + |
1807 | +load(ubuntu_qt_module) |
1808 | + |
1809 | +# Remove the ASCII cast warnings added by qt_module. |
1810 | +DEFINES -= QT_ASCII_CAST_WARNINGS |
1811 | |
1812 | === modified file 'src/UbuntuToolkit/actionlist.cpp' |
1813 | --- src/Ubuntu/UbuntuToolkit/actionlist.cpp 2016-09-15 15:10:46 +0000 |
1814 | +++ src/UbuntuToolkit/actionlist.cpp 2016-09-17 11:46:32 +0000 |
1815 | @@ -15,6 +15,7 @@ |
1816 | */ |
1817 | |
1818 | #include "actionlist_p.h" |
1819 | + |
1820 | #include "ucaction_p.h" |
1821 | |
1822 | UT_NAMESPACE_BEGIN |
1823 | |
1824 | === modified file 'src/UbuntuToolkit/actionlist_p.h' |
1825 | --- src/Ubuntu/UbuntuToolkit/actionlist_p.h 2016-09-15 15:10:46 +0000 |
1826 | +++ src/UbuntuToolkit/actionlist_p.h 2016-09-17 11:46:32 +0000 |
1827 | @@ -14,12 +14,13 @@ |
1828 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1829 | */ |
1830 | |
1831 | -#ifndef ACTIONLIST_H |
1832 | -#define ACTIONLIST_H |
1833 | +#ifndef ACTIONLIST_P_H |
1834 | +#define ACTIONLIST_P_H |
1835 | |
1836 | -#include <QObject> |
1837 | +#include <QtCore/QObject> |
1838 | #include <QtQml/QQmlListProperty> |
1839 | -#include "ubuntutoolkitglobal.h" |
1840 | + |
1841 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
1842 | |
1843 | UT_NAMESPACE_BEGIN |
1844 | |
1845 | @@ -58,4 +59,4 @@ |
1846 | |
1847 | UT_NAMESPACE_END |
1848 | |
1849 | -#endif // ACTIONLIST_H |
1850 | +#endif // ACTIONLIST_P_H |
1851 | |
1852 | === modified file 'src/UbuntuToolkit/adapters/actionsproxy_p.cpp' |
1853 | --- src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp 2016-07-07 07:21:48 +0000 |
1854 | +++ src/UbuntuToolkit/adapters/actionsproxy_p.cpp 2016-09-17 11:46:32 +0000 |
1855 | @@ -14,11 +14,12 @@ |
1856 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1857 | */ |
1858 | |
1859 | -#include "actionsproxy_p.h" |
1860 | +#include "adapters/actionsproxy_p.h" |
1861 | + |
1862 | +#include <QtCore/QDebug> |
1863 | + |
1864 | #include "ucactioncontext_p.h" |
1865 | |
1866 | -#include <QDebug> |
1867 | - |
1868 | Q_LOGGING_CATEGORY(ucActionProxy, "ubuntu.components.ActionProxy", QtMsgType::QtWarningMsg) |
1869 | |
1870 | #define AP_TRACE(params) qCDebug(ucActionProxy) << params |
1871 | |
1872 | === modified file 'src/UbuntuToolkit/adapters/actionsproxy_p.h' |
1873 | --- src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h 2016-07-07 07:21:48 +0000 |
1874 | +++ src/UbuntuToolkit/adapters/actionsproxy_p.h 2016-09-17 11:46:32 +0000 |
1875 | @@ -20,7 +20,8 @@ |
1876 | #include <QtCore/QObject> |
1877 | #include <QtCore/QSet> |
1878 | #include <QtCore/QPointer> |
1879 | -#include "ucaction_p.h" |
1880 | + |
1881 | +#include <UbuntuToolkit/private/ucaction_p.h> |
1882 | |
1883 | UT_NAMESPACE_BEGIN |
1884 | |
1885 | |
1886 | === modified file 'src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp' |
1887 | --- src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp 2016-07-07 07:21:48 +0000 |
1888 | +++ src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp 2016-09-17 11:46:32 +0000 |
1889 | @@ -16,11 +16,7 @@ |
1890 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
1891 | */ |
1892 | |
1893 | -#include "ucalarm_p.h" |
1894 | -#include "ucalarm_p_p.h" |
1895 | -#include "alarmmanager_p_p.h" |
1896 | -#include "alarmsadapter_p.h" |
1897 | -#include <qorganizertodooccurrence.h> |
1898 | +#include "adapters/alarmsadapter_p.h" |
1899 | |
1900 | #include <QtCore/QFile> |
1901 | #include <QtCore/QDir> |
1902 | @@ -30,6 +26,10 @@ |
1903 | #include <QtCore/QJsonObject> |
1904 | #include <QtCore/QJsonArray> |
1905 | #include <QtCore/QDebug> |
1906 | +#include <QtOrganizer/QtOrganizer> |
1907 | + |
1908 | +#include "alarmmanager_p_p.h" |
1909 | +#include "ucalarm_p_p.h" |
1910 | |
1911 | #define ALARM_DATABASE "%1/alarms.json" |
1912 | /* |
1913 | |
1914 | === modified file 'src/UbuntuToolkit/adapters/alarmsadapter_p.h' |
1915 | --- src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h 2016-07-07 15:33:34 +0000 |
1916 | +++ src/UbuntuToolkit/adapters/alarmsadapter_p.h 2016-09-17 11:46:32 +0000 |
1917 | @@ -19,13 +19,14 @@ |
1918 | #ifndef ALARMSADAPTER_P_H |
1919 | #define ALARMSADAPTER_P_H |
1920 | |
1921 | -#include "private/ucalarm_p_p.h" |
1922 | -#include "private/alarmmanager_p_p.h" |
1923 | +#include <QtOrganizer/QOrganizerManager> |
1924 | +#include <QtOrganizer/QOrganizerAbstractRequest> |
1925 | +#include <QtOrganizer/QOrganizerItemFetchRequest> |
1926 | +#include <QtOrganizer/QOrganizerTodo> |
1927 | |
1928 | -#include <qorganizer.h> |
1929 | -#include <qorganizermanager.h> |
1930 | -#include <qorganizertodo.h> |
1931 | -#include <ubuntutoolkitglobal.h> |
1932 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
1933 | +#include <UbuntuToolkit/private/ucalarm_p_p.h> |
1934 | +#include <UbuntuToolkit/private/alarmmanager_p_p.h> |
1935 | |
1936 | QTORGANIZER_USE_NAMESPACE |
1937 | |
1938 | |
1939 | === modified file 'src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp' |
1940 | --- src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp 2016-07-07 07:21:48 +0000 |
1941 | +++ src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp 2016-09-17 11:46:32 +0000 |
1942 | @@ -14,12 +14,15 @@ |
1943 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
1944 | */ |
1945 | |
1946 | -#include "dbuspropertywatcher_p.h" |
1947 | +#include "adapters/dbuspropertywatcher_p.h" |
1948 | + |
1949 | +#include <sys/types.h> |
1950 | +#include <unistd.h> |
1951 | + |
1952 | #include <QtDBus/QDBusReply> |
1953 | -#include <unistd.h> |
1954 | -#include <sys/types.h> |
1955 | +#include <QtQml/QQmlInfo> |
1956 | + |
1957 | #include "i18n_p.h" |
1958 | -#include <QtQml/QQmlInfo> |
1959 | |
1960 | #define DYNAMIC_PROPERTY "__q_property" |
1961 | |
1962 | |
1963 | === modified file 'src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h' |
1964 | --- src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h 2016-07-07 07:21:48 +0000 |
1965 | +++ src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h 2016-09-17 11:46:32 +0000 |
1966 | @@ -22,7 +22,7 @@ |
1967 | #include <QtDBus/QDBusServiceWatcher> |
1968 | #include <QtDBus/QDBusInterface> |
1969 | |
1970 | -#include "ucserviceproperties_p_p.h" |
1971 | +#include <UbuntuToolkit/private/ucserviceproperties_p_p.h> |
1972 | |
1973 | class QDBusPendingCallWatcher; |
1974 | |
1975 | |
1976 | === modified file 'src/UbuntuToolkit/alarmmanager_p.cpp' |
1977 | --- src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp 2016-07-07 07:21:48 +0000 |
1978 | +++ src/UbuntuToolkit/alarmmanager_p.cpp 2016-09-17 11:46:32 +0000 |
1979 | @@ -17,6 +17,7 @@ |
1980 | */ |
1981 | |
1982 | #include "alarmmanager_p_p.h" |
1983 | + |
1984 | #include "ucalarm_p_p.h" |
1985 | |
1986 | UT_NAMESPACE_BEGIN |
1987 | |
1988 | === modified file 'src/UbuntuToolkit/alarmmanager_p.h' |
1989 | --- src/Ubuntu/UbuntuToolkit/alarmmanager_p.h 2016-07-07 07:21:48 +0000 |
1990 | +++ src/UbuntuToolkit/alarmmanager_p.h 2016-09-17 11:46:32 +0000 |
1991 | @@ -16,14 +16,14 @@ |
1992 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
1993 | */ |
1994 | |
1995 | -#ifndef ALARMMANAGER_H |
1996 | -#define ALARMMANAGER_H |
1997 | +#ifndef ALARMMANAGER_P_H |
1998 | +#define ALARMMANAGER_P_H |
1999 | |
2000 | #include <QtCore/QObject> |
2001 | +#include <QtCore/QSet> |
2002 | #include <QtQml/QQmlListProperty> |
2003 | -#include <QtCore/QSet> |
2004 | |
2005 | -#include "ucalarm_p.h" |
2006 | +#include <UbuntuToolkit/private/ucalarm_p.h> |
2007 | |
2008 | UT_NAMESPACE_BEGIN |
2009 | |
2010 | @@ -126,4 +126,4 @@ |
2011 | |
2012 | UT_NAMESPACE_END |
2013 | |
2014 | -#endif // ALARMMANAGER_H |
2015 | +#endif // ALARMMANAGER_P_H |
2016 | |
2017 | === modified file 'src/UbuntuToolkit/alarmmanager_p_p.h' |
2018 | --- src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h 2016-07-07 07:21:48 +0000 |
2019 | +++ src/UbuntuToolkit/alarmmanager_p_p.h 2016-09-17 11:46:32 +0000 |
2020 | @@ -16,13 +16,15 @@ |
2021 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
2022 | */ |
2023 | |
2024 | -#ifndef ALARMMANAGER_P_H |
2025 | -#define ALARMMANAGER_P_H |
2026 | - |
2027 | -#include "ucalarm_p.h" |
2028 | -#include "alarmmanager_p.h" |
2029 | +#ifndef ALARMMANAGER_P_P_H |
2030 | +#define ALARMMANAGER_P_P_H |
2031 | + |
2032 | +#include <UbuntuToolkit/private/alarmmanager_p.h> |
2033 | + |
2034 | #include <QtCore/QUrl> |
2035 | |
2036 | +#include <UbuntuToolkit/private/ucalarm_p.h> |
2037 | + |
2038 | UT_NAMESPACE_BEGIN |
2039 | |
2040 | class UBUNTUTOOLKIT_EXPORT AlarmManagerPrivate |
2041 | @@ -61,4 +63,4 @@ |
2042 | |
2043 | UT_NAMESPACE_END |
2044 | |
2045 | -#endif // ALARMMANAGER_P_H |
2046 | +#endif // ALARMMANAGER_P_P_H |
2047 | |
2048 | === modified file 'src/UbuntuToolkit/asyncloader_p.h' |
2049 | --- src/Ubuntu/UbuntuToolkit/asyncloader_p.h 2016-07-07 07:21:48 +0000 |
2050 | +++ src/UbuntuToolkit/asyncloader_p.h 2016-09-17 11:46:32 +0000 |
2051 | @@ -16,11 +16,12 @@ |
2052 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
2053 | */ |
2054 | |
2055 | -#ifndef ASYNCLOADER_H |
2056 | -#define ASYNCLOADER_H |
2057 | +#ifndef ASYNCLOADER_P_H |
2058 | +#define ASYNCLOADER_P_H |
2059 | |
2060 | #include <QtQml/QQmlComponent> |
2061 | -#include <ubuntutoolkitglobal.h> |
2062 | + |
2063 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2064 | |
2065 | class QQuickItem; |
2066 | class QQmlContext; |
2067 | @@ -60,4 +61,4 @@ |
2068 | |
2069 | UT_NAMESPACE_END |
2070 | |
2071 | -#endif // ASYNCLOADER_H |
2072 | +#endif // ASYNCLOADER_P_H |
2073 | |
2074 | === modified file 'src/UbuntuToolkit/asyncloader_p_p.h' |
2075 | --- src/Ubuntu/UbuntuToolkit/asyncloader_p_p.h 2016-07-07 15:33:34 +0000 |
2076 | +++ src/UbuntuToolkit/asyncloader_p_p.h 2016-09-17 11:46:32 +0000 |
2077 | @@ -16,14 +16,15 @@ |
2078 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
2079 | */ |
2080 | |
2081 | -#ifndef ASYNCLOADER_P_H |
2082 | -#define ASYNCLOADER_P_H |
2083 | +#ifndef ASYNCLOADER_P_P_H |
2084 | +#define ASYNCLOADER_P_P_H |
2085 | + |
2086 | +#include <UbuntuToolkit/private/asyncloader_p.h> |
2087 | |
2088 | #include <QtCore/private/qobject_p.h> |
2089 | #include <QtQml/QQmlIncubator> |
2090 | -#include <ubuntutoolkitglobal.h> |
2091 | -#include <UbuntuToolkit/private/asyncloader_p.h> |
2092 | -#include <UbuntuToolkit/private/asyncloader_p_p.h> |
2093 | + |
2094 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2095 | |
2096 | UT_NAMESPACE_BEGIN |
2097 | |
2098 | @@ -52,4 +53,4 @@ |
2099 | |
2100 | UT_NAMESPACE_END |
2101 | |
2102 | -#endif // ASYNCLOADER_P_H |
2103 | +#endif // ASYNCLOADER_P_P_H |
2104 | |
2105 | === modified file 'src/UbuntuToolkit/colorutils.cpp' |
2106 | --- src/Ubuntu/UbuntuToolkit/colorutils.cpp 2016-07-07 07:21:48 +0000 |
2107 | +++ src/UbuntuToolkit/colorutils.cpp 2016-09-17 11:46:32 +0000 |
2108 | @@ -15,7 +15,8 @@ |
2109 | */ |
2110 | |
2111 | #include "colorutils_p.h" |
2112 | -#include <QColor> |
2113 | + |
2114 | +#include <QtGui/QColor> |
2115 | |
2116 | UT_NAMESPACE_BEGIN |
2117 | |
2118 | |
2119 | === modified file 'src/UbuntuToolkit/colorutils_p.h' |
2120 | --- src/Ubuntu/UbuntuToolkit/colorutils_p.h 2016-07-07 07:21:48 +0000 |
2121 | +++ src/UbuntuToolkit/colorutils_p.h 2016-09-17 11:46:32 +0000 |
2122 | @@ -13,11 +13,13 @@ |
2123 | * You should have received a copy of the GNU Lesser General Public License |
2124 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2125 | */ |
2126 | -#ifndef COLORUTILS_H |
2127 | -#define COLORUTILS_H |
2128 | - |
2129 | -#include <QObject> |
2130 | -#include "ubuntutoolkitglobal.h" |
2131 | + |
2132 | +#ifndef COLORUTILS_P_H |
2133 | +#define COLORUTILS_P_H |
2134 | + |
2135 | +#include <QtCore/QObject> |
2136 | + |
2137 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2138 | |
2139 | UT_NAMESPACE_BEGIN |
2140 | |
2141 | @@ -31,4 +33,4 @@ |
2142 | |
2143 | UT_NAMESPACE_END |
2144 | |
2145 | -#endif // COLORUTILS_H |
2146 | +#endif // COLORUTILS_P_H |
2147 | |
2148 | === modified file 'src/UbuntuToolkit/exclusivegroup.cpp' |
2149 | --- src/Ubuntu/UbuntuToolkit/exclusivegroup.cpp 2016-07-18 14:54:46 +0000 |
2150 | +++ src/UbuntuToolkit/exclusivegroup.cpp 2016-09-17 11:46:32 +0000 |
2151 | @@ -12,14 +12,14 @@ |
2152 | * |
2153 | * You should have received a copy of the GNU Lesser General Public License |
2154 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2155 | - * |
2156 | */ |
2157 | |
2158 | #include "exclusivegroup_p.h" |
2159 | + |
2160 | +#include <QtCore/QSignalMapper> |
2161 | + |
2162 | #include "ucaction_p.h" |
2163 | |
2164 | -#include <QSignalMapper> |
2165 | - |
2166 | #define CHECKED_PROPERTY "checked" |
2167 | |
2168 | UT_NAMESPACE_BEGIN |
2169 | |
2170 | === modified file 'src/UbuntuToolkit/exclusivegroup_p.h' |
2171 | --- src/Ubuntu/UbuntuToolkit/exclusivegroup_p.h 2016-08-22 08:23:50 +0000 |
2172 | +++ src/UbuntuToolkit/exclusivegroup_p.h 2016-09-17 11:46:32 +0000 |
2173 | @@ -12,17 +12,16 @@ |
2174 | * |
2175 | * You should have received a copy of the GNU Lesser General Public License |
2176 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2177 | - * |
2178 | */ |
2179 | |
2180 | -#ifndef EXCLUSIVEGROUP_H |
2181 | -#define EXCLUSIVEGROUP_H |
2182 | - |
2183 | -#include "actionlist_p.h" |
2184 | -#include "ubuntutoolkitglobal.h" |
2185 | - |
2186 | -#include <QMetaMethod> |
2187 | -#include <QPointer> |
2188 | +#ifndef EXCLUSIVEGROUP_P_H |
2189 | +#define EXCLUSIVEGROUP_P_H |
2190 | + |
2191 | +#include <QtCore/QMetaMethod> |
2192 | +#include <QtCore/QPointer> |
2193 | + |
2194 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2195 | +#include <UbuntuToolkit/private/actionlist_p.h> |
2196 | |
2197 | class QSignalMapper; |
2198 | |
2199 | @@ -59,4 +58,4 @@ |
2200 | |
2201 | UT_NAMESPACE_END |
2202 | |
2203 | -#endif // EXCLUSIVEGROUP_H |
2204 | +#endif // EXCLUSIVEGROUP_P_H |
2205 | |
2206 | === modified file 'src/UbuntuToolkit/filterbehavior_p.h' |
2207 | --- src/Ubuntu/UbuntuToolkit/filterbehavior_p.h 2016-07-07 07:21:48 +0000 |
2208 | +++ src/UbuntuToolkit/filterbehavior_p.h 2016-09-17 11:46:32 +0000 |
2209 | @@ -17,11 +17,12 @@ |
2210 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2211 | */ |
2212 | |
2213 | -#ifndef FILTERBEHAVIOR_H |
2214 | -#define FILTERBEHAVIOR_H |
2215 | - |
2216 | -#include <QSortFilterProxyModel> |
2217 | -#include <ubuntutoolkitglobal.h> |
2218 | +#ifndef FILTERBEHAVIOR_P_H |
2219 | +#define FILTERBEHAVIOR_P_H |
2220 | + |
2221 | +#include <QtCore/QSortFilterProxyModel> |
2222 | + |
2223 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2224 | |
2225 | UT_NAMESPACE_BEGIN |
2226 | |
2227 | @@ -50,4 +51,4 @@ |
2228 | |
2229 | UT_NAMESPACE_END |
2230 | |
2231 | -#endif // FILTERBEHAVIOR_H |
2232 | +#endif // FILTERBEHAVIOR_P_H |
2233 | |
2234 | === modified file 'src/UbuntuToolkit/i18n.cpp' |
2235 | --- src/Ubuntu/UbuntuToolkit/i18n.cpp 2016-07-07 07:21:48 +0000 |
2236 | +++ src/UbuntuToolkit/i18n.cpp 2016-09-17 11:46:32 +0000 |
2237 | @@ -17,18 +17,19 @@ |
2238 | */ |
2239 | |
2240 | #include "i18n_p.h" |
2241 | -#include "timeutils_p.h" |
2242 | -#include <QtCore/QDir> |
2243 | |
2244 | namespace C { |
2245 | #include <libintl.h> |
2246 | #include <glib.h> |
2247 | #include <glib/gi18n.h> |
2248 | } |
2249 | - |
2250 | #include <stdlib.h> |
2251 | #include <locale.h> |
2252 | |
2253 | +#include <QtCore/QDir> |
2254 | + |
2255 | +#include "timeutils_p.h" |
2256 | + |
2257 | UT_NAMESPACE_BEGIN |
2258 | /*! |
2259 | * \qmltype i18n |
2260 | |
2261 | === modified file 'src/UbuntuToolkit/i18n_p.h' |
2262 | --- src/Ubuntu/UbuntuToolkit/i18n_p.h 2016-07-07 07:21:48 +0000 |
2263 | +++ src/UbuntuToolkit/i18n_p.h 2016-09-17 11:46:32 +0000 |
2264 | @@ -16,11 +16,12 @@ |
2265 | * Author: Tim Peeters <tim.peeters@canonical.com> |
2266 | */ |
2267 | |
2268 | -#ifndef UBUNTU_COMPONENTS_I18N_H |
2269 | -#define UBUNTU_COMPONENTS_I18N_H |
2270 | +#ifndef I18N_P_H |
2271 | +#define I18N_P_H |
2272 | |
2273 | #include <QtCore/QObject> |
2274 | -#include <ubuntutoolkitglobal.h> |
2275 | + |
2276 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2277 | |
2278 | class QQmlContext; |
2279 | class QQmlEngine; |
2280 | @@ -80,4 +81,4 @@ |
2281 | |
2282 | UT_NAMESPACE_END |
2283 | |
2284 | -#endif // UBUNTU_COMPONENTS_I18N_H |
2285 | +#endif // I18N_P_H |
2286 | |
2287 | === modified file 'src/UbuntuToolkit/inversemouseareatype.cpp' |
2288 | --- src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp 2016-07-07 07:21:48 +0000 |
2289 | +++ src/UbuntuToolkit/inversemouseareatype.cpp 2016-09-17 11:46:32 +0000 |
2290 | @@ -15,7 +15,9 @@ |
2291 | */ |
2292 | |
2293 | #include "inversemouseareatype_p.h" |
2294 | + |
2295 | #include <QtGui/QGuiApplication> |
2296 | + |
2297 | #include "quickutils_p.h" |
2298 | |
2299 | UT_NAMESPACE_BEGIN |
2300 | |
2301 | === modified file 'src/UbuntuToolkit/inversemouseareatype_p.h' |
2302 | --- src/Ubuntu/UbuntuToolkit/inversemouseareatype_p.h 2016-07-07 07:21:48 +0000 |
2303 | +++ src/UbuntuToolkit/inversemouseareatype_p.h 2016-09-17 11:46:32 +0000 |
2304 | @@ -13,12 +13,14 @@ |
2305 | * You should have received a copy of the GNU Lesser General Public License |
2306 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2307 | */ |
2308 | -#ifndef INVERSEMOUSEAREATYPE_H |
2309 | -#define INVERSEMOUSEAREATYPE_H |
2310 | - |
2311 | -#include <private/qquickmousearea_p.h> |
2312 | + |
2313 | +#ifndef INVERSEMOUSEAREATYPE_P_H |
2314 | +#define INVERSEMOUSEAREATYPE_P_H |
2315 | + |
2316 | #include <QtCore/QPointer> |
2317 | -#include <ubuntutoolkitglobal.h> |
2318 | +#include <QtQuick/private/qquickmousearea_p.h> |
2319 | + |
2320 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2321 | |
2322 | class QQuickItem; |
2323 | |
2324 | @@ -73,4 +75,4 @@ |
2325 | |
2326 | UT_NAMESPACE_END |
2327 | |
2328 | -#endif // INVERSEMOUSEAREATYPE_H |
2329 | +#endif // INVERSEMOUSEAREATYPE_P_H |
2330 | |
2331 | === modified file 'src/UbuntuToolkit/label_p.h' |
2332 | --- src/Ubuntu/UbuntuToolkit/label_p.h 2016-07-07 07:21:48 +0000 |
2333 | +++ src/UbuntuToolkit/label_p.h 2016-09-17 11:46:32 +0000 |
2334 | @@ -14,8 +14,8 @@ |
2335 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2336 | */ |
2337 | |
2338 | -#ifndef LABEL_P |
2339 | -#define LABEL_P |
2340 | +#ifndef LABEL_P_H |
2341 | +#define LABEL_P_H |
2342 | |
2343 | #include "uclabel_p.h" |
2344 | |
2345 | @@ -59,4 +59,4 @@ |
2346 | |
2347 | UT_NAMESPACE_END |
2348 | |
2349 | -#endif // LABEL_P |
2350 | +#endif // LABEL_P_H |
2351 | |
2352 | === modified file 'src/UbuntuToolkit/listener.cpp' |
2353 | --- src/Ubuntu/UbuntuToolkit/listener.cpp 2016-07-07 07:21:48 +0000 |
2354 | +++ src/UbuntuToolkit/listener.cpp 2016-09-17 11:46:32 +0000 |
2355 | @@ -16,7 +16,7 @@ |
2356 | |
2357 | #include "listener_p.h" |
2358 | |
2359 | -#include <QQmlContext> |
2360 | +#include <QtQml/QQmlContext> |
2361 | |
2362 | UT_NAMESPACE_BEGIN |
2363 | |
2364 | |
2365 | === modified file 'src/UbuntuToolkit/listener_p.h' |
2366 | --- src/Ubuntu/UbuntuToolkit/listener_p.h 2016-07-07 07:21:48 +0000 |
2367 | +++ src/UbuntuToolkit/listener_p.h 2016-09-17 11:46:32 +0000 |
2368 | @@ -14,11 +14,12 @@ |
2369 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2370 | */ |
2371 | |
2372 | -#ifndef UBUNTU_COMPONENTS_LISTENER_H |
2373 | -#define UBUNTU_COMPONENTS_LISTENER_H |
2374 | +#ifndef LISTENER_P_H |
2375 | +#define LISTENER_P_H |
2376 | |
2377 | #include <QtCore/QObject> |
2378 | -#include <ubuntutoolkitglobal.h> |
2379 | + |
2380 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2381 | |
2382 | class QQmlContext; |
2383 | |
2384 | @@ -36,4 +37,4 @@ |
2385 | |
2386 | UT_NAMESPACE_END |
2387 | |
2388 | -#endif // UBUNTU_COMPONENTS_PLUGIN_H |
2389 | +#endif // LISTENER_P_H |
2390 | |
2391 | === modified file 'src/UbuntuToolkit/livetimer_p.cpp' |
2392 | --- src/Ubuntu/UbuntuToolkit/livetimer_p.cpp 2016-07-07 07:21:48 +0000 |
2393 | +++ src/UbuntuToolkit/livetimer_p.cpp 2016-09-17 11:46:32 +0000 |
2394 | @@ -15,10 +15,11 @@ |
2395 | */ |
2396 | |
2397 | #include "livetimer_p_p.h" |
2398 | + |
2399 | +#include <QtDBus/QDBusConnection> |
2400 | + |
2401 | #include "timeutils_p.h" |
2402 | |
2403 | -#include <QDBusConnection> |
2404 | - |
2405 | UT_NAMESPACE_BEGIN |
2406 | |
2407 | SharedLiveTimer::SharedLiveTimer(QObject* parent) |
2408 | |
2409 | === modified file 'src/UbuntuToolkit/livetimer_p.h' |
2410 | --- src/Ubuntu/UbuntuToolkit/livetimer_p.h 2016-07-07 07:21:48 +0000 |
2411 | +++ src/UbuntuToolkit/livetimer_p.h 2016-09-17 11:46:32 +0000 |
2412 | @@ -14,12 +14,13 @@ |
2413 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2414 | */ |
2415 | |
2416 | -#ifndef LIVETIMER_H |
2417 | -#define LIVETIMER_H |
2418 | - |
2419 | -#include <QObject> |
2420 | -#include <QDateTime> |
2421 | -#include <ubuntutoolkitglobal.h> |
2422 | +#ifndef LIVETIMER_P_H |
2423 | +#define LIVETIMER_P_H |
2424 | + |
2425 | +#include <QtCore/QDateTime> |
2426 | +#include <QtCore/QObject> |
2427 | + |
2428 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2429 | |
2430 | UT_NAMESPACE_BEGIN |
2431 | |
2432 | @@ -70,4 +71,4 @@ |
2433 | |
2434 | UT_NAMESPACE_END |
2435 | |
2436 | -#endif // LIVETIMER_H |
2437 | +#endif // LIVETIMER_P_H |
2438 | |
2439 | === modified file 'src/UbuntuToolkit/livetimer_p_p.h' |
2440 | --- src/Ubuntu/UbuntuToolkit/livetimer_p_p.h 2016-07-07 07:21:48 +0000 |
2441 | +++ src/UbuntuToolkit/livetimer_p_p.h 2016-09-17 11:46:32 +0000 |
2442 | @@ -14,12 +14,12 @@ |
2443 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2444 | */ |
2445 | |
2446 | -#ifndef LIVETIMER_P_H |
2447 | -#define LIVETIMER_P_H |
2448 | - |
2449 | -#include "livetimer_p.h" |
2450 | - |
2451 | -#include <QTimer> |
2452 | +#ifndef LIVETIMER_P_P_H |
2453 | +#define LIVETIMER_P_P_H |
2454 | + |
2455 | +#include <UbuntuToolkit/private/livetimer_p.h> |
2456 | + |
2457 | +#include <QtCore/QTimer> |
2458 | |
2459 | UT_NAMESPACE_BEGIN |
2460 | |
2461 | @@ -59,4 +59,4 @@ |
2462 | |
2463 | UT_NAMESPACE_END |
2464 | |
2465 | -#endif // LIVETIMER_P_H |
2466 | +#endif // LIVETIMER_P_P_H |
2467 | |
2468 | === modified file 'src/UbuntuToolkit/menu.cpp' |
2469 | --- src/Ubuntu/UbuntuToolkit/menu.cpp 2016-08-25 14:06:06 +0000 |
2470 | +++ src/UbuntuToolkit/menu.cpp 2016-09-17 11:46:32 +0000 |
2471 | @@ -14,23 +14,22 @@ |
2472 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2473 | */ |
2474 | |
2475 | -#include "menu_p.h" |
2476 | #include "menu_p_p.h" |
2477 | + |
2478 | +#include <functional> |
2479 | + |
2480 | +#include <QtCore/QPointer> |
2481 | +#include <QtCore/QLoggingCategory> |
2482 | +#include <QtGui/qpa/qplatformtheme.h> |
2483 | +#include <QtGui/qpa/qplatformmenu.h> |
2484 | +#include <QtGui/private/qguiapplication_p.h> |
2485 | +#include <QtQuick/QQuickItem> |
2486 | +#include <QtQuick/private/qquickitem_p.h> |
2487 | + |
2488 | #include "menubar_p.h" |
2489 | #include "actionlist_p.h" |
2490 | #include "menugroup_p.h" |
2491 | |
2492 | -// Qt |
2493 | -#include <QPointer> |
2494 | -#include <QQuickItem> |
2495 | -#include <QLoggingCategory> |
2496 | -#include <QtGui/qpa/qplatformtheme.h> |
2497 | -#include <QtGui/qpa/qplatformmenu.h> |
2498 | -#include <private/qguiapplication_p.h> |
2499 | -#include <private/qquickitem_p.h> |
2500 | - |
2501 | -#include <functional> |
2502 | - |
2503 | Q_LOGGING_CATEGORY(ucMenu, "ubuntu.components.Menu", QtMsgType::QtWarningMsg) |
2504 | |
2505 | UT_NAMESPACE_BEGIN |
2506 | @@ -350,8 +349,6 @@ |
2507 | : UCAction(parent) |
2508 | , d_ptr(new MenuPrivate(this)) |
2509 | { |
2510 | - Q_D(Menu); |
2511 | - |
2512 | connect(this, SIGNAL(enabledChanged()), this, SLOT(_q_updateEnabled())); |
2513 | connect(this, SIGNAL(textChanged()), this, SLOT(_q_updateText())); |
2514 | connect(this, SIGNAL(iconNameChanged()), this, SLOT(_q_updateIcon())); |
2515 | |
2516 | === modified file 'src/UbuntuToolkit/menu_p.h' |
2517 | --- src/Ubuntu/UbuntuToolkit/menu_p.h 2016-08-25 14:06:06 +0000 |
2518 | +++ src/UbuntuToolkit/menu_p.h 2016-09-17 11:46:32 +0000 |
2519 | @@ -12,18 +12,17 @@ |
2520 | * |
2521 | * You should have received a copy of the GNU Lesser General Public License |
2522 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2523 | - * |
2524 | */ |
2525 | |
2526 | #ifndef MENU_P_H |
2527 | #define MENU_P_H |
2528 | |
2529 | -#include <QQmlListProperty> |
2530 | -#include <QLoggingCategory> |
2531 | -#include <QPointer> |
2532 | -#include <ubuntutoolkitglobal.h> |
2533 | +#include <QtCore/QLoggingCategory> |
2534 | +#include <QtCore/QPointer> |
2535 | +#include <QtQml/QQmlListProperty> |
2536 | |
2537 | -#include "ucaction_p.h" |
2538 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2539 | +#include <UbuntuToolkit/private/ucaction_p.h> |
2540 | |
2541 | Q_DECLARE_LOGGING_CATEGORY(ucMenu); |
2542 | |
2543 | |
2544 | === modified file 'src/UbuntuToolkit/menu_p_p.h' |
2545 | --- src/Ubuntu/UbuntuToolkit/menu_p_p.h 2016-08-25 14:06:06 +0000 |
2546 | +++ src/UbuntuToolkit/menu_p_p.h 2016-09-17 11:46:32 +0000 |
2547 | @@ -12,14 +12,14 @@ |
2548 | * |
2549 | * You should have received a copy of the GNU Lesser General Public License |
2550 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2551 | - * |
2552 | */ |
2553 | |
2554 | #ifndef MENU_P_P_H |
2555 | #define MENU_P_P_H |
2556 | |
2557 | -#include "menu_p.h" |
2558 | -#include <ubuntutoolkitglobal.h> |
2559 | +#include <UbuntuToolkit/private/menu_p.h> |
2560 | + |
2561 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2562 | |
2563 | class QObject; |
2564 | class QQmlComponent; |
2565 | |
2566 | === modified file 'src/UbuntuToolkit/menubar.cpp' |
2567 | --- src/Ubuntu/UbuntuToolkit/menubar.cpp 2016-08-25 14:06:06 +0000 |
2568 | +++ src/UbuntuToolkit/menubar.cpp 2016-09-17 11:46:32 +0000 |
2569 | @@ -12,19 +12,16 @@ |
2570 | * |
2571 | * You should have received a copy of the GNU Lesser General Public License |
2572 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2573 | - * |
2574 | */ |
2575 | |
2576 | -#include "menubar_p.h" |
2577 | #include "menubar_p_p.h" |
2578 | |
2579 | -// Qt |
2580 | -#include <QQuickItem> |
2581 | -#include <QQuickWindow> |
2582 | -#include <QLoggingCategory> |
2583 | -#include <private/qguiapplication_p.h> |
2584 | +#include <QtCore/QLoggingCategory> |
2585 | +#include <QtQuick/QQuickItem> |
2586 | +#include <QtQuick/QQuickWindow> |
2587 | #include <QtGui/qpa/qplatformtheme.h> |
2588 | #include <QtGui/qpa/qplatformmenu.h> |
2589 | +#include <QtGui/private/qguiapplication_p.h> |
2590 | |
2591 | UT_NAMESPACE_BEGIN |
2592 | |
2593 | |
2594 | === modified file 'src/UbuntuToolkit/menubar_p.h' |
2595 | --- src/Ubuntu/UbuntuToolkit/menubar_p.h 2016-08-25 14:06:06 +0000 |
2596 | +++ src/UbuntuToolkit/menubar_p.h 2016-09-17 11:46:32 +0000 |
2597 | @@ -12,16 +12,15 @@ |
2598 | * |
2599 | * You should have received a copy of the GNU Lesser General Public License |
2600 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2601 | - * |
2602 | */ |
2603 | |
2604 | #ifndef MENUBAR_P_H |
2605 | #define MENUBAR_P_H |
2606 | |
2607 | -#include "menu_p.h" |
2608 | -#include <ubuntutoolkitglobal.h> |
2609 | +#include <QtQml/QQmlParserStatus> |
2610 | |
2611 | -#include <QQmlParserStatus> |
2612 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2613 | +#include <UbuntuToolkit/private/menu_p.h> |
2614 | |
2615 | class QPlatformMenuBar; |
2616 | |
2617 | |
2618 | === modified file 'src/UbuntuToolkit/menubar_p_p.h' |
2619 | --- src/Ubuntu/UbuntuToolkit/menubar_p_p.h 2016-08-25 14:06:06 +0000 |
2620 | +++ src/UbuntuToolkit/menubar_p_p.h 2016-09-17 11:46:32 +0000 |
2621 | @@ -12,14 +12,14 @@ |
2622 | * |
2623 | * You should have received a copy of the GNU Lesser General Public License |
2624 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2625 | - * |
2626 | */ |
2627 | |
2628 | #ifndef MENUBAR_P_P_H |
2629 | #define MENUBAR_P_P_H |
2630 | |
2631 | -#include "menubar_p.h" |
2632 | -#include <ubuntutoolkitglobal.h> |
2633 | +#include <UbuntuToolkit/private/menubar_p.h> |
2634 | + |
2635 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2636 | |
2637 | class QPlatformMenuBar; |
2638 | |
2639 | |
2640 | === modified file 'src/UbuntuToolkit/menugroup.cpp' |
2641 | --- src/Ubuntu/UbuntuToolkit/menugroup.cpp 2016-08-25 14:06:06 +0000 |
2642 | +++ src/UbuntuToolkit/menugroup.cpp 2016-09-17 11:46:32 +0000 |
2643 | @@ -15,6 +15,7 @@ |
2644 | */ |
2645 | |
2646 | #include "menugroup_p.h" |
2647 | + |
2648 | #include "actionlist_p.h" |
2649 | #include "ucaction_p.h" |
2650 | |
2651 | |
2652 | === modified file 'src/UbuntuToolkit/menugroup_p.h' |
2653 | --- src/Ubuntu/UbuntuToolkit/menugroup_p.h 2016-08-25 14:06:06 +0000 |
2654 | +++ src/UbuntuToolkit/menugroup_p.h 2016-09-17 11:46:32 +0000 |
2655 | @@ -17,11 +17,11 @@ |
2656 | #ifndef MENUGROUP_P_H |
2657 | #define MENUGROUP_P_H |
2658 | |
2659 | -#include <ubuntutoolkitglobal.h> |
2660 | +#include <QtCore/QObject> |
2661 | +#include <QtCore/QVector> |
2662 | +#include <QtQml/QQmlListProperty> |
2663 | |
2664 | -#include <QObject> |
2665 | -#include <QVector> |
2666 | -#include <QQmlListProperty> |
2667 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2668 | |
2669 | UT_NAMESPACE_BEGIN |
2670 | |
2671 | |
2672 | === modified file 'src/UbuntuToolkit/mousetouchadaptor.cpp' |
2673 | --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp 2016-07-07 07:56:34 +0000 |
2674 | +++ src/UbuntuToolkit/mousetouchadaptor.cpp 2016-09-17 11:46:32 +0000 |
2675 | @@ -19,12 +19,11 @@ |
2676 | |
2677 | #include "mousetouchadaptor_p_p.h" |
2678 | |
2679 | -#include <qpa/qplatformnativeinterface.h> |
2680 | -#include <qpa/qwindowsysteminterface.h> |
2681 | - |
2682 | -#include <QCoreApplication> |
2683 | -#include <QMouseEvent> |
2684 | -#include <QTest> |
2685 | +#include <QtCore/QDebug> |
2686 | +#include <QtGui/QGuiApplication> |
2687 | +#include <QtGui/QMouseEvent> |
2688 | +#include <QtGui/qpa/qplatformnativeinterface.h> |
2689 | +#include <QtGui/qpa/qwindowsysteminterface.h> |
2690 | |
2691 | #ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION |
2692 | #define ENABLE_TOUCH_EMULATION |
2693 | |
2694 | === modified file 'src/UbuntuToolkit/mousetouchadaptor_p.h' |
2695 | --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h 2016-07-07 18:17:56 +0000 |
2696 | +++ src/UbuntuToolkit/mousetouchadaptor_p.h 2016-09-17 11:46:32 +0000 |
2697 | @@ -17,13 +17,13 @@ |
2698 | * Zsombor Egri <zsomboir.egri@canonical.com> |
2699 | */ |
2700 | |
2701 | -#ifndef MOUSE_TOUCH_ADAPTOR_H |
2702 | -#define MOUSE_TOUCH_ADAPTOR_H |
2703 | - |
2704 | -#include "ubuntutoolkitglobal.h" |
2705 | +#ifndef MOUSETOUCHADAPTOR_P_H |
2706 | +#define MOUSETOUCHADAPTOR_P_H |
2707 | |
2708 | #include <QtCore/QObject> |
2709 | |
2710 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2711 | + |
2712 | class QMouseEvent; |
2713 | class QTouchDevice; |
2714 | class QQmlEngine; |
2715 | @@ -60,4 +60,4 @@ |
2716 | |
2717 | UT_NAMESPACE_END |
2718 | |
2719 | -#endif // MOUSE_TOUCH_ADAPTOR_H |
2720 | +#endif // MOUSETOUCHADAPTOR_P_H |
2721 | |
2722 | === modified file 'src/UbuntuToolkit/mousetouchadaptor_p_p.h' |
2723 | --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p_p.h 2016-07-07 07:21:48 +0000 |
2724 | +++ src/UbuntuToolkit/mousetouchadaptor_p_p.h 2016-09-17 11:46:32 +0000 |
2725 | @@ -16,13 +16,15 @@ |
2726 | * Authored by: Zsombor Egri <zsombor.egri@canonical.com> |
2727 | */ |
2728 | |
2729 | -#ifndef MOUSETOUCHADAPTOR_P |
2730 | -#define MOUSETOUCHADAPTOR_P |
2731 | - |
2732 | -#include "mousetouchadaptor_p.h" |
2733 | +#ifndef MOUSETOUCHADAPTOR_P_P_H |
2734 | +#define MOUSETOUCHADAPTOR_P_P_H |
2735 | + |
2736 | +#include <UbuntuToolkit/private/mousetouchadaptor_p.h> |
2737 | + |
2738 | +#include <QtCore/QAbstractNativeEventFilter> |
2739 | #include <QtCore/private/qobject_p.h> |
2740 | -#include <QtCore/QAbstractNativeEventFilter> |
2741 | -#include <QWindow> |
2742 | +#include <QtGui/QWindow> |
2743 | + |
2744 | #include <xcb/xcb.h> |
2745 | |
2746 | UT_NAMESPACE_BEGIN |
2747 | @@ -73,5 +75,4 @@ |
2748 | |
2749 | UT_NAMESPACE_END |
2750 | |
2751 | -#endif // MOUSETOUCHADAPTOR_P |
2752 | - |
2753 | +#endif // MOUSETOUCHADAPTOR_P_P_H |
2754 | |
2755 | === modified file 'src/UbuntuToolkit/mousetouchadaptor_x11.cpp' |
2756 | --- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp 2016-07-07 07:21:48 +0000 |
2757 | +++ src/UbuntuToolkit/mousetouchadaptor_x11.cpp 2016-09-17 11:46:32 +0000 |
2758 | @@ -55,11 +55,10 @@ |
2759 | |
2760 | #include "mousetouchadaptor_p_p.h" |
2761 | |
2762 | -#include <qpa/qplatformnativeinterface.h> |
2763 | - |
2764 | -#include <QCoreApplication> |
2765 | -#include <QMouseEvent> |
2766 | -#include <QTest> |
2767 | +#include <QtGui/QGuiApplication> |
2768 | +#include <QtGui/QMouseEvent> |
2769 | +#include <QtGui/qpa/qplatformnativeinterface.h> |
2770 | +#include <QtTest/qtesttouch.h> |
2771 | |
2772 | #include <X11/extensions/XInput2.h> |
2773 | #include <X11/extensions/XI2proto.h> |
2774 | |
2775 | === modified file 'src/UbuntuToolkit/privates/appheaderbase.cpp' |
2776 | --- src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp 2016-07-07 07:21:48 +0000 |
2777 | +++ src/UbuntuToolkit/privates/appheaderbase.cpp 2016-09-17 11:46:32 +0000 |
2778 | @@ -15,6 +15,7 @@ |
2779 | */ |
2780 | |
2781 | #include "appheaderbase_p.h" |
2782 | + |
2783 | #include "ucstyleditembase_p_p.h" |
2784 | |
2785 | UT_NAMESPACE_BEGIN |
2786 | |
2787 | === modified file 'src/UbuntuToolkit/privates/appheaderbase_p.h' |
2788 | --- src/Ubuntu/UbuntuToolkit/privates/appheaderbase_p.h 2016-07-07 07:21:48 +0000 |
2789 | +++ src/UbuntuToolkit/privates/appheaderbase_p.h 2016-09-17 11:46:32 +0000 |
2790 | @@ -14,10 +14,10 @@ |
2791 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2792 | */ |
2793 | |
2794 | -#ifndef APPHEADERBASE_H |
2795 | -#define APPHEADERBASE_H |
2796 | +#ifndef APPHEADERBASE_P_H |
2797 | +#define APPHEADERBASE_P_H |
2798 | |
2799 | -#include "ucheader_p.h" |
2800 | +#include <UbuntuToolkit/private/ucheader_p.h> |
2801 | |
2802 | UT_NAMESPACE_BEGIN |
2803 | |
2804 | @@ -62,4 +62,4 @@ |
2805 | |
2806 | UT_NAMESPACE_END |
2807 | |
2808 | -#endif // APPHEADERBASE_H |
2809 | +#endif // APPHEADERBASE_P_H |
2810 | |
2811 | === modified file 'src/UbuntuToolkit/privates/frame.cpp' |
2812 | --- src/Ubuntu/UbuntuToolkit/privates/frame.cpp 2016-07-07 07:21:48 +0000 |
2813 | +++ src/UbuntuToolkit/privates/frame.cpp 2016-09-17 11:46:32 +0000 |
2814 | @@ -16,11 +16,13 @@ |
2815 | * Author: Loïc Molinari <loic.molinari@canonical.com> |
2816 | */ |
2817 | |
2818 | -#include "frame_p.h" |
2819 | -#include "textures_p.h" |
2820 | +#include "privates/frame_p.h" |
2821 | + |
2822 | #include <QtGui/QOpenGLContext> |
2823 | #include <QtGui/QOpenGLFunctions> |
2824 | |
2825 | +#include "privates/textures_p.h" |
2826 | + |
2827 | UT_NAMESPACE_BEGIN |
2828 | |
2829 | const QRgb defaultColor = qRgba(255, 255, 255, 255); |
2830 | |
2831 | === modified file 'src/UbuntuToolkit/privates/frame_p.h' |
2832 | --- src/Ubuntu/UbuntuToolkit/privates/frame_p.h 2016-07-07 07:21:48 +0000 |
2833 | +++ src/UbuntuToolkit/privates/frame_p.h 2016-09-17 11:46:32 +0000 |
2834 | @@ -16,13 +16,14 @@ |
2835 | * Author: Loïc Molinari <loic.molinari@canonical.com> |
2836 | */ |
2837 | |
2838 | -#ifndef FRAME_H |
2839 | -#define FRAME_H |
2840 | +#ifndef FRAME_P_H |
2841 | +#define FRAME_P_H |
2842 | |
2843 | #include <QtQuick/QQuickItem> |
2844 | #include <QtQuick/QSGMaterial> |
2845 | #include <QtQuick/QSGNode> |
2846 | -#include <ubuntutoolkitglobal.h> |
2847 | + |
2848 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2849 | |
2850 | UT_NAMESPACE_BEGIN |
2851 | |
2852 | @@ -101,4 +102,4 @@ |
2853 | |
2854 | UT_NAMESPACE_END |
2855 | |
2856 | -#endif // FRAME_H |
2857 | +#endif // FRAME_P_H |
2858 | |
2859 | === modified file 'src/UbuntuToolkit/privates/listitemdragarea.cpp' |
2860 | --- src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp 2016-08-14 09:06:34 +0000 |
2861 | +++ src/UbuntuToolkit/privates/listitemdragarea.cpp 2016-09-17 11:46:32 +0000 |
2862 | @@ -15,15 +15,17 @@ |
2863 | */ |
2864 | |
2865 | #include "listitemdragarea_p.h" |
2866 | -#include "listitemdraghandler_p.h" |
2867 | -#include "uclistitem_p_p.h" |
2868 | -#include "ucunits_p.h" |
2869 | -#include "i18n_p.h" |
2870 | + |
2871 | #include <QtCore/QtMath> |
2872 | #include <QtQml/QQmlInfo> |
2873 | #include <QtQuick/private/qquickitem_p.h> |
2874 | #include <QtQuick/private/qquickflickable_p.h> |
2875 | |
2876 | +#include "privates/listitemdraghandler_p.h" |
2877 | +#include "uclistitem_p_p.h" |
2878 | +#include "ucunits_p.h" |
2879 | +#include "i18n_p.h" |
2880 | + |
2881 | #define IMPLICIT_DRAG_WIDTH_GU 5 |
2882 | #define DRAG_SCROLL_TIMEOUT 15 |
2883 | |
2884 | |
2885 | === modified file 'src/UbuntuToolkit/privates/listitemdragarea_p.h' |
2886 | --- src/Ubuntu/UbuntuToolkit/privates/listitemdragarea_p.h 2016-07-07 07:21:48 +0000 |
2887 | +++ src/UbuntuToolkit/privates/listitemdragarea_p.h 2016-09-17 11:46:32 +0000 |
2888 | @@ -14,14 +14,15 @@ |
2889 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2890 | */ |
2891 | |
2892 | -#ifndef LISTITEMDRAGAREA_H |
2893 | -#define LISTITEMDRAGAREA_H |
2894 | +#ifndef LISTITEMDRAGAREA_P_H |
2895 | +#define LISTITEMDRAGAREA_P_H |
2896 | |
2897 | -#include <ubuntutoolkitglobal.h> |
2898 | -#include "uclistitem_p.h" |
2899 | #include <QtCore/QBasicTimer> |
2900 | #include <QtCore/QPointer> |
2901 | |
2902 | +#include <UbuntuToolkit/private/uclistitem_p.h> |
2903 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2904 | + |
2905 | class QQuickFlickable; |
2906 | |
2907 | UT_NAMESPACE_BEGIN |
2908 | @@ -58,4 +59,4 @@ |
2909 | |
2910 | UT_NAMESPACE_END |
2911 | |
2912 | -#endif // LISTITEMDRAGAREA_H |
2913 | +#endif // LISTITEMDRAGAREA_P_H |
2914 | |
2915 | === modified file 'src/UbuntuToolkit/privates/listitemdraghandler.cpp' |
2916 | --- src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp 2016-07-07 07:21:48 +0000 |
2917 | +++ src/UbuntuToolkit/privates/listitemdraghandler.cpp 2016-09-17 11:46:32 +0000 |
2918 | @@ -14,11 +14,12 @@ |
2919 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2920 | */ |
2921 | |
2922 | -#include "listitemdraghandler_p.h" |
2923 | -#include "uclistitem_p.h" |
2924 | +#include "privates/listitemdraghandler_p.h" |
2925 | + |
2926 | +#include <QtQuick/private/qquickanimation_p.h> |
2927 | + |
2928 | #include "uclistitem_p_p.h" |
2929 | -#include <propertychange_p.h> |
2930 | -#include <QtQuick/private/qquickanimation_p.h> |
2931 | +#include "propertychange_p.h" |
2932 | |
2933 | UT_NAMESPACE_BEGIN |
2934 | |
2935 | |
2936 | === modified file 'src/UbuntuToolkit/privates/listitemdraghandler_p.h' |
2937 | --- src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler_p.h 2016-07-07 07:21:48 +0000 |
2938 | +++ src/UbuntuToolkit/privates/listitemdraghandler_p.h 2016-09-17 11:46:32 +0000 |
2939 | @@ -14,13 +14,14 @@ |
2940 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2941 | */ |
2942 | |
2943 | -#ifndef LISTITEMDRAGHANDLER_H |
2944 | -#define LISTITEMDRAGHANDLER_H |
2945 | +#ifndef LISTITEMDRAGHANDLER_P_H |
2946 | +#define LISTITEMDRAGHANDLER_P_H |
2947 | |
2948 | #include <QtCore/QObject> |
2949 | #include <QtCore/QPointer> |
2950 | #include <QtCore/QPointF> |
2951 | -#include <ubuntutoolkitglobal.h> |
2952 | + |
2953 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2954 | |
2955 | UT_NAMESPACE_BEGIN |
2956 | |
2957 | @@ -49,4 +50,4 @@ |
2958 | |
2959 | UT_NAMESPACE_END |
2960 | |
2961 | -#endif // LISTITEMDRAGHANDLER_H |
2962 | +#endif // LISTITEMDRAGHANDLER_P_H |
2963 | |
2964 | === modified file 'src/UbuntuToolkit/privates/listitemselection.cpp' |
2965 | --- src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp 2016-07-07 07:21:48 +0000 |
2966 | +++ src/UbuntuToolkit/privates/listitemselection.cpp 2016-09-17 11:46:32 +0000 |
2967 | @@ -14,7 +14,8 @@ |
2968 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2969 | */ |
2970 | |
2971 | -#include "listitemselection_p.h" |
2972 | +#include "privates/listitemselection_p.h" |
2973 | + |
2974 | #include "uclistitem_p_p.h" |
2975 | |
2976 | UT_NAMESPACE_BEGIN |
2977 | |
2978 | === modified file 'src/UbuntuToolkit/privates/listitemselection_p.h' |
2979 | --- src/Ubuntu/UbuntuToolkit/privates/listitemselection_p.h 2016-07-07 07:21:48 +0000 |
2980 | +++ src/UbuntuToolkit/privates/listitemselection_p.h 2016-09-17 11:46:32 +0000 |
2981 | @@ -14,12 +14,13 @@ |
2982 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
2983 | */ |
2984 | |
2985 | -#ifndef LISTITEMSELECTION_H |
2986 | -#define LISTITEMSELECTION_H |
2987 | +#ifndef LISTITEMSELECTION_P_H |
2988 | +#define LISTITEMSELECTION_P_H |
2989 | |
2990 | #include <QtCore/QObject> |
2991 | #include <QtCore/QPointer> |
2992 | -#include <ubuntutoolkitglobal.h> |
2993 | + |
2994 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
2995 | |
2996 | UT_NAMESPACE_BEGIN |
2997 | |
2998 | @@ -58,4 +59,4 @@ |
2999 | |
3000 | UT_NAMESPACE_END |
3001 | |
3002 | -#endif // LISTITEMSELECTION_H |
3003 | +#endif // LISTITEMSELECTION_P_H |
3004 | |
3005 | === modified file 'src/UbuntuToolkit/privates/listviewextensions.cpp' |
3006 | --- src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp 2016-08-01 13:19:05 +0000 |
3007 | +++ src/UbuntuToolkit/privates/listviewextensions.cpp 2016-09-17 11:46:32 +0000 |
3008 | @@ -16,19 +16,24 @@ |
3009 | * Author Zsombor Egri <zsombor.egri@canonical.com> |
3010 | */ |
3011 | |
3012 | -#include "listviewextensions_p.h" |
3013 | -#include "uclistitem_p_p.h" |
3014 | -#include "quickutils_p.h" |
3015 | +#include "privates/listviewextensions_p.h" |
3016 | + |
3017 | #include <QtQuick/QQuickItem> |
3018 | #include <QtQuick/private/qquickflickable_p.h> |
3019 | #include <QtQuick/private/qquickitemview_p.h> // for QQuickItemView::BottomToTop |
3020 | |
3021 | +#include "uclistitem_p_p.h" |
3022 | +#include "quickutils_p.h" |
3023 | + |
3024 | UT_NAMESPACE_BEGIN |
3025 | |
3026 | ListViewProxy::ListViewProxy(QQuickFlickable *listView, QObject *parent) |
3027 | : QObject(parent) |
3028 | , listView(listView) |
3029 | + , _currentItem(Q_NULLPTR) |
3030 | { |
3031 | + connect(listView, SIGNAL(currentItemChanged()), this, SLOT(onCurrentItemChanged()), Qt::DirectConnection); |
3032 | + onCurrentItemChanged(); |
3033 | } |
3034 | ListViewProxy::~ListViewProxy() |
3035 | { |
3036 | @@ -51,7 +56,7 @@ |
3037 | |
3038 | QQuickItem *ListViewProxy::currentItem() |
3039 | { |
3040 | - return listView->property("currentItem").value<QQuickItem*>(); |
3041 | + return _currentItem; |
3042 | } |
3043 | |
3044 | int ListViewProxy::currentIndex() |
3045 | @@ -100,7 +105,7 @@ |
3046 | |
3047 | void ListViewProxy::setKeyNavigationForListView(bool value) |
3048 | { |
3049 | - UCListItem *listItem = qobject_cast<UCListItem*>(currentItem()); |
3050 | + UCListItem *listItem = qobject_cast<UCListItem*>(_currentItem); |
3051 | if (listItem) { |
3052 | UCListItemPrivate::get(listItem)->setListViewKeyNavigation(value); |
3053 | listItem->update(); |
3054 | @@ -114,8 +119,7 @@ |
3055 | case Qt::TabFocusReason: |
3056 | case Qt::BacktabFocusReason: |
3057 | { |
3058 | - QQuickItem *currentItem = this->currentItem(); |
3059 | - if (!currentItem && count() > 0) { |
3060 | + if (!_currentItem && count() > 0) { |
3061 | // set the first one to be the focus |
3062 | setCurrentIndex(0); |
3063 | setKeyNavigationForListView(true); |
3064 | @@ -135,25 +139,22 @@ |
3065 | int key = event->key(); |
3066 | Qt::Orientation orientation = this->orientation(); |
3067 | |
3068 | - if ((orientation == Qt::Vertical && key != Qt::Key_Up && key != Qt::Key_Down) |
3069 | - || (orientation == Qt::Horizontal && key != Qt::Key_Left && key != Qt::Key_Right)) { |
3070 | - return false; |
3071 | - } |
3072 | - // effectiveLayoutDirection takes into account effectiveLayoutMirror and layoutDirection. |
3073 | - bool isRtl = (Qt::RightToLeft == listView->property("effectiveLayoutDirection").toInt()); |
3074 | - bool isBtt = (QQuickItemView::BottomToTop == listView->property("verticalLayoutDirection").toInt()); |
3075 | - bool forwards = (isBtt ? key == Qt::Key_Up : key == Qt::Key_Down) || (isRtl ? key == Qt::Key_Left : key == Qt::Key_Right); |
3076 | - int oldIndex = this->currentIndex(); |
3077 | - int currentIndex = this->currentIndex(); |
3078 | - int count = this->count(); |
3079 | - |
3080 | - if (currentIndex >= 0 && count > 0) { |
3081 | - currentIndex = qBound<int>(0, forwards ? currentIndex + 1 : currentIndex - 1, count - 1); |
3082 | - setCurrentIndex(currentIndex); |
3083 | - setKeyNavigationForListView(true); |
3084 | - } |
3085 | - |
3086 | - return (oldIndex != currentIndex); |
3087 | + if ((orientation == Qt::Vertical && (key == Qt::Key_Up || key == Qt::Key_Down)) |
3088 | + || (orientation == Qt::Horizontal && (key == Qt::Key_Left || key == Qt::Key_Right))) { |
3089 | + keyNavigation = true; |
3090 | + } |
3091 | + |
3092 | + return false; |
3093 | +} |
3094 | + |
3095 | +void ListViewProxy::onCurrentItemChanged() |
3096 | +{ |
3097 | + setKeyNavigationForListView(false); |
3098 | + _currentItem = listView->property("currentItem").value<QQuickItem*>(); |
3099 | + if (_currentItem && _currentItem->isEnabled()) { |
3100 | + setKeyNavigationForListView(keyNavigation); |
3101 | + keyNavigation = false; |
3102 | + } |
3103 | } |
3104 | |
3105 | UT_NAMESPACE_END |
3106 | |
3107 | === modified file 'src/UbuntuToolkit/privates/listviewextensions_p.h' |
3108 | --- src/Ubuntu/UbuntuToolkit/privates/listviewextensions_p.h 2016-07-07 07:21:48 +0000 |
3109 | +++ src/UbuntuToolkit/privates/listviewextensions_p.h 2016-09-17 11:46:32 +0000 |
3110 | @@ -16,11 +16,13 @@ |
3111 | * Author Zsombor Egri <zsombor.egri@canonical.com> |
3112 | */ |
3113 | |
3114 | -#ifndef LISTVIEWEXTENSIONS_H |
3115 | -#define LISTVIEWEXTENSIONS_H |
3116 | +#ifndef LISTVIEWEXTENSIONS_P_H |
3117 | +#define LISTVIEWEXTENSIONS_P_H |
3118 | |
3119 | #include <QtCore/QObject> |
3120 | -#include <ubuntutoolkitglobal.h> |
3121 | +#include <QtCore/QPointer> |
3122 | + |
3123 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3124 | |
3125 | class QQuickFlickable; |
3126 | class QQuickItem; |
3127 | @@ -56,11 +58,14 @@ |
3128 | bool focusInEvent(QFocusEvent *event); |
3129 | bool keyPressEvent(QKeyEvent *event); |
3130 | void setKeyNavigationForListView(bool value); |
3131 | + Q_SLOT void onCurrentItemChanged(); |
3132 | private: |
3133 | QQuickFlickable *listView; |
3134 | + QPointer<QQuickItem> _currentItem; |
3135 | bool isEventFilter:1; |
3136 | + bool keyNavigation:1; |
3137 | }; |
3138 | |
3139 | UT_NAMESPACE_END |
3140 | |
3141 | -#endif // LISTVIEWEXTENSIONS_H |
3142 | +#endif // LISTVIEWEXTENSIONS_P_H |
3143 | |
3144 | === modified file 'src/UbuntuToolkit/privates/splitviewhandler.cpp' |
3145 | --- src/Ubuntu/UbuntuToolkit/privates/splitviewhandler.cpp 2016-08-26 05:40:23 +0000 |
3146 | +++ src/UbuntuToolkit/privates/splitviewhandler.cpp 2016-09-17 11:46:32 +0000 |
3147 | @@ -16,13 +16,15 @@ |
3148 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3149 | */ |
3150 | |
3151 | -#include "splitviewhandler_p_p.h" |
3152 | +#include "privates/splitviewhandler_p.h" |
3153 | + |
3154 | +#include <QtQml/QQmlEngine> |
3155 | +#include <QtQml/QQmlInfo> |
3156 | #include <QtQuick/private/qquickanchors_p.h> |
3157 | #include <QtQuick/private/qquickitem_p.h> |
3158 | #include <QtQuick/private/qquickevents_p_p.h> |
3159 | -#include <QtQml/QQmlEngine> |
3160 | -#include <QtQml/QQmlInfo> |
3161 | -#include <splitview_p_p.h> |
3162 | + |
3163 | +#include "splitview_p_p.h" |
3164 | |
3165 | UT_NAMESPACE_BEGIN |
3166 | |
3167 | |
3168 | === renamed file 'src/Ubuntu/UbuntuToolkit/privates/splitviewhandler_p_p.h' => 'src/UbuntuToolkit/privates/splitviewhandler_p.h' |
3169 | --- src/Ubuntu/UbuntuToolkit/privates/splitviewhandler_p_p.h 2016-08-26 05:40:23 +0000 |
3170 | +++ src/UbuntuToolkit/privates/splitviewhandler_p.h 2016-09-17 11:46:32 +0000 |
3171 | @@ -16,13 +16,14 @@ |
3172 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3173 | */ |
3174 | |
3175 | -#ifndef SPLITVIEWHANDLER_H |
3176 | -#define SPLITVIEWHANDLER_H |
3177 | +#ifndef SPLITVIEWHANDLER_P_H |
3178 | +#define SPLITVIEWHANDLER_P_H |
3179 | |
3180 | +#include <QtCore/QPointer> |
3181 | #include <QtQuick/QQuickItem> |
3182 | -#include <QtCore/QPointer> |
3183 | #include <QtQuick/private/qquickmousearea_p.h> |
3184 | -#include <ubuntutoolkitglobal.h> |
3185 | + |
3186 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3187 | |
3188 | UT_NAMESPACE_BEGIN |
3189 | |
3190 | @@ -49,4 +50,4 @@ |
3191 | |
3192 | UT_NAMESPACE_END |
3193 | |
3194 | -#endif // SPLITVIEWHANDLER_H |
3195 | +#endif // SPLITVIEWHANDLER_P_H |
3196 | |
3197 | === modified file 'src/UbuntuToolkit/privates/threelabelsslot_p.cpp' |
3198 | --- src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp 2016-07-18 17:18:13 +0000 |
3199 | +++ src/UbuntuToolkit/privates/threelabelsslot_p.cpp 2016-09-17 11:46:32 +0000 |
3200 | @@ -14,7 +14,8 @@ |
3201 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3202 | */ |
3203 | |
3204 | -#include "threelabelsslot_p.h" |
3205 | +#include "privates/threelabelsslot_p.h" |
3206 | + |
3207 | #include "label_p.h" |
3208 | #include "ucunits_p.h" |
3209 | #include "ucfontutils_p.h" |
3210 | |
3211 | === modified file 'src/UbuntuToolkit/privates/threelabelsslot_p.h' |
3212 | --- src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h 2016-06-21 13:16:07 +0000 |
3213 | +++ src/UbuntuToolkit/privates/threelabelsslot_p.h 2016-09-17 11:46:32 +0000 |
3214 | @@ -14,12 +14,12 @@ |
3215 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3216 | */ |
3217 | |
3218 | -#ifndef THREELABELSSLOT_H |
3219 | -#define THREELABELSSLOT_H |
3220 | - |
3221 | -#include <QQuickItem> |
3222 | -#include <private/qquickitem_p.h> |
3223 | -#include <ubuntutoolkitglobal.h> |
3224 | +#ifndef THREELABELSSLOT_P_H |
3225 | +#define THREELABELSSLOT_P_H |
3226 | + |
3227 | +#include <QtQuick/private/qquickitem_p.h> |
3228 | + |
3229 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3230 | |
3231 | //The padding between title and the string below it (i.e. subtitle, or |
3232 | //summary, when subtitle is empty) |
3233 | @@ -89,4 +89,4 @@ |
3234 | |
3235 | UT_NAMESPACE_END |
3236 | |
3237 | -#endif // THREELABELSSLOT_H |
3238 | +#endif // THREELABELSSLOT_P_H |
3239 | |
3240 | === modified file 'src/UbuntuToolkit/privates/ucpagewrapper.cpp' |
3241 | --- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp 2016-08-08 11:51:22 +0000 |
3242 | +++ src/UbuntuToolkit/privates/ucpagewrapper.cpp 2016-09-17 11:46:32 +0000 |
3243 | @@ -14,11 +14,12 @@ |
3244 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3245 | */ |
3246 | |
3247 | -#include "ucpagewrapper_p_p.h" |
3248 | -#include "ucpagewrapperincubator_p.h" |
3249 | - |
3250 | -#include <QQmlEngine> |
3251 | -#include <QQmlContext> |
3252 | +#include "privates/ucpagewrapper_p_p.h" |
3253 | + |
3254 | +#include <QtQml/QQmlEngine> |
3255 | +#include <QtQml/QQmlContext> |
3256 | + |
3257 | +#include "privates/ucpagewrapperincubator_p.h" |
3258 | |
3259 | UT_NAMESPACE_BEGIN |
3260 | |
3261 | |
3262 | === modified file 'src/UbuntuToolkit/privates/ucpagewrapper_p.h' |
3263 | --- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h 2016-07-07 07:21:48 +0000 |
3264 | +++ src/UbuntuToolkit/privates/ucpagewrapper_p.h 2016-09-17 11:46:32 +0000 |
3265 | @@ -14,11 +14,11 @@ |
3266 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3267 | */ |
3268 | |
3269 | -#ifndef UCPAGEWRAPPER_H |
3270 | -#define UCPAGEWRAPPER_H |
3271 | +#ifndef UCPAGEWRAPPER_P_H |
3272 | +#define UCPAGEWRAPPER_P_H |
3273 | |
3274 | -#include <ubuntutoolkitglobal.h> |
3275 | -#include "ucpagetreenode_p.h" |
3276 | +#include <UbuntuToolkit/private/ucpagetreenode_p.h> |
3277 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3278 | |
3279 | UT_NAMESPACE_BEGIN |
3280 | |
3281 | |
3282 | === modified file 'src/UbuntuToolkit/privates/ucpagewrapper_p_p.h' |
3283 | --- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p_p.h 2016-07-07 07:21:48 +0000 |
3284 | +++ src/UbuntuToolkit/privates/ucpagewrapper_p_p.h 2016-09-17 11:46:32 +0000 |
3285 | @@ -14,12 +14,13 @@ |
3286 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3287 | */ |
3288 | |
3289 | -#ifndef UCPAGEWRAPPER_P_H |
3290 | -#define UCPAGEWRAPPER_P_H |
3291 | - |
3292 | -#include <ubuntutoolkitglobal.h> |
3293 | -#include "ucpagetreenode_p_p.h" |
3294 | -#include "ucpagewrapper_p.h" |
3295 | +#ifndef UCPAGEWRAPPER_P_P_H |
3296 | +#define UCPAGEWRAPPER_P_P_H |
3297 | + |
3298 | +#include <UbuntuToolkit/private/ucpagewrapper_p.h> |
3299 | + |
3300 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3301 | +#include <UbuntuToolkit/private/ucpagetreenode_p_p.h> |
3302 | |
3303 | UT_NAMESPACE_BEGIN |
3304 | |
3305 | @@ -80,4 +81,4 @@ |
3306 | |
3307 | UT_NAMESPACE_END |
3308 | |
3309 | -#endif // UCPAGEWRAPPER_P_H |
3310 | +#endif // UCPAGEWRAPPER_P_P_H |
3311 | |
3312 | === modified file 'src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp' |
3313 | --- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp 2016-06-17 11:26:12 +0000 |
3314 | +++ src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp 2016-09-17 11:46:32 +0000 |
3315 | @@ -14,9 +14,10 @@ |
3316 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3317 | */ |
3318 | |
3319 | -#include "ucpagewrapperincubator_p.h" |
3320 | -#include <QVariantMap> |
3321 | -#include <QQmlInfo> |
3322 | +#include "privates/ucpagewrapperincubator_p.h" |
3323 | + |
3324 | +#include <QtCore/QVariantMap> |
3325 | +#include <QtQml/QQmlInfo> |
3326 | |
3327 | UT_NAMESPACE_BEGIN |
3328 | |
3329 | |
3330 | === modified file 'src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h' |
3331 | --- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h 2016-06-17 11:26:12 +0000 |
3332 | +++ src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h 2016-09-17 11:46:32 +0000 |
3333 | @@ -14,14 +14,15 @@ |
3334 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3335 | */ |
3336 | |
3337 | -#ifndef UCPAGEWRAPPERINCUBATOR_H |
3338 | -#define UCPAGEWRAPPERINCUBATOR_H |
3339 | - |
3340 | -#include <QObject> |
3341 | -#include <QQmlIncubator> |
3342 | -#include <QJSValue> |
3343 | -#include <QVariant> |
3344 | -#include <ubuntutoolkitglobal.h> |
3345 | +#ifndef UCPAGEWRAPPERINCUBATOR_P_H |
3346 | +#define UCPAGEWRAPPERINCUBATOR_P_H |
3347 | + |
3348 | +#include <QtCore/QObject> |
3349 | +#include <QtCore/QVariant> |
3350 | +#include <QtQml/QQmlIncubator> |
3351 | +#include <QtQml/QJSValue> |
3352 | + |
3353 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3354 | |
3355 | UT_NAMESPACE_BEGIN |
3356 | |
3357 | @@ -61,4 +62,4 @@ |
3358 | |
3359 | UT_NAMESPACE_END |
3360 | |
3361 | -#endif // UCPAGEWRAPPERINCUBATOR_H |
3362 | +#endif // UCPAGEWRAPPERINCUBATOR_P_H |
3363 | |
3364 | === modified file 'src/UbuntuToolkit/privates/ucscrollbarutils.cpp' |
3365 | --- src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils.cpp 2016-08-01 13:48:02 +0000 |
3366 | +++ src/UbuntuToolkit/privates/ucscrollbarutils.cpp 2016-09-17 11:46:32 +0000 |
3367 | @@ -16,7 +16,8 @@ |
3368 | * Author: Andrea Bernabei <andrea.bernabei@canonical.com> |
3369 | */ |
3370 | |
3371 | -#include "ucscrollbarutils_p.h" |
3372 | +#include "privates/ucscrollbarutils_p.h" |
3373 | + |
3374 | #include <QtQuick/private/qquickitem_p.h> |
3375 | |
3376 | UT_NAMESPACE_BEGIN |
3377 | |
3378 | === modified file 'src/UbuntuToolkit/privates/ucscrollbarutils_p.h' |
3379 | --- src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils_p.h 2016-08-01 13:48:02 +0000 |
3380 | +++ src/UbuntuToolkit/privates/ucscrollbarutils_p.h 2016-09-17 11:46:32 +0000 |
3381 | @@ -16,11 +16,12 @@ |
3382 | * Author: Andrea Bernabei <andrea.bernabei@canonical.com> |
3383 | */ |
3384 | |
3385 | -#ifndef UCSCROLLBARUTILS_H |
3386 | -#define UCSCROLLBARUTILS_H |
3387 | - |
3388 | -#include <QObject> |
3389 | -#include <ubuntutoolkitglobal.h> |
3390 | +#ifndef UCSCROLLBARUTILS_P_H |
3391 | +#define UCSCROLLBARUTILS_P_H |
3392 | + |
3393 | +#include <QtCore/QObject> |
3394 | + |
3395 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3396 | |
3397 | class QQuickItem; |
3398 | |
3399 | @@ -38,4 +39,4 @@ |
3400 | |
3401 | UT_NAMESPACE_END |
3402 | |
3403 | -#endif // UCSCROLLBARUTILS_H |
3404 | +#endif // UCSCROLLBARUTILS_P_H |
3405 | |
3406 | === modified file 'src/UbuntuToolkit/propertychange_p.h' |
3407 | --- src/Ubuntu/UbuntuToolkit/propertychange_p.h 2016-07-07 07:21:48 +0000 |
3408 | +++ src/UbuntuToolkit/propertychange_p.h 2016-09-17 11:46:32 +0000 |
3409 | @@ -17,14 +17,14 @@ |
3410 | #ifndef PROPERTYCHANGE_P_H |
3411 | #define PROPERTYCHANGE_P_H |
3412 | |
3413 | +#include <QtCore/QObject> |
3414 | #include <QtCore/QVariant> |
3415 | -#include <QtCore/QObject> |
3416 | +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) |
3417 | +#include <QtCore/QExplicitlySharedDataPointer> |
3418 | +#endif |
3419 | #include <QtQml/QQmlProperty> |
3420 | |
3421 | -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) |
3422 | -#include <QtCore/QExplicitlySharedDataPointer> |
3423 | -#endif |
3424 | -#include <ubuntutoolkitglobal.h> |
3425 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3426 | |
3427 | class QQmlAbstractBinding; |
3428 | |
3429 | |
3430 | === modified file 'src/UbuntuToolkit/qquickclipboard.cpp' |
3431 | --- src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp 2016-07-07 18:17:56 +0000 |
3432 | +++ src/UbuntuToolkit/qquickclipboard.cpp 2016-09-17 11:46:32 +0000 |
3433 | @@ -16,10 +16,11 @@ |
3434 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3435 | */ |
3436 | |
3437 | +#include "qquickclipboard_p_p.h" |
3438 | + |
3439 | #include <QtGui/QClipboard> |
3440 | #include <QtGui/QGuiApplication> |
3441 | |
3442 | -#include "qquickclipboard_p_p.h" |
3443 | #include "qquickmimedata_p.h" |
3444 | |
3445 | UT_NAMESPACE_BEGIN |
3446 | |
3447 | === modified file 'src/UbuntuToolkit/qquickclipboard_p.h' |
3448 | --- src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h 2016-07-07 18:17:56 +0000 |
3449 | +++ src/UbuntuToolkit/qquickclipboard_p.h 2016-09-17 11:46:32 +0000 |
3450 | @@ -16,13 +16,14 @@ |
3451 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3452 | */ |
3453 | |
3454 | -#ifndef QQUICKCLIPBOARD_H |
3455 | -#define QQUICKCLIPBOARD_H |
3456 | +#ifndef QQUICKCLIPBOARD_P_H |
3457 | +#define QQUICKCLIPBOARD_P_H |
3458 | |
3459 | #include <QtCore/QObject> |
3460 | #include <QtQml/QJSEngine> |
3461 | #include <QtQml/QQmlEngine> |
3462 | -#include <ubuntutoolkitglobal.h> |
3463 | + |
3464 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3465 | |
3466 | class QQmlEngine; |
3467 | class QJSEngine; |
3468 | @@ -60,4 +61,4 @@ |
3469 | |
3470 | UT_NAMESPACE_END |
3471 | |
3472 | -#endif // QQUICKCLIPBOARD_H |
3473 | +#endif // QQUICKCLIPBOARD_P_H |
3474 | |
3475 | === modified file 'src/UbuntuToolkit/qquickclipboard_p_p.h' |
3476 | --- src/Ubuntu/UbuntuToolkit/qquickclipboard_p_p.h 2016-07-07 18:17:56 +0000 |
3477 | +++ src/UbuntuToolkit/qquickclipboard_p_p.h 2016-09-17 11:46:32 +0000 |
3478 | @@ -16,12 +16,13 @@ |
3479 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3480 | */ |
3481 | |
3482 | -#ifndef QQUICKCLIPBOARD_P_H |
3483 | -#define QQUICKCLIPBOARD_P_H |
3484 | - |
3485 | -#include "qquickclipboard_p.h" |
3486 | +#ifndef QQUICKCLIPBOARD_P_P_H |
3487 | +#define QQUICKCLIPBOARD_P_P_H |
3488 | + |
3489 | +#include <UbuntuToolkit/private/qquickclipboard_p.h> |
3490 | + |
3491 | +#include <QtCore/private/qobject_p.h> |
3492 | #include <QtGui/QClipboard> |
3493 | -#include <QtCore/private/qobject_p.h> |
3494 | |
3495 | UT_NAMESPACE_BEGIN |
3496 | |
3497 | @@ -41,4 +42,4 @@ |
3498 | |
3499 | UT_NAMESPACE_END |
3500 | |
3501 | -#endif // QQUICKCLIPBOARD_P_H |
3502 | +#endif // QQUICKCLIPBOARD_P_P_H |
3503 | |
3504 | === modified file 'src/UbuntuToolkit/qquickmimedata.cpp' |
3505 | --- src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp 2016-07-07 07:21:48 +0000 |
3506 | +++ src/UbuntuToolkit/qquickmimedata.cpp 2016-09-17 11:46:32 +0000 |
3507 | @@ -16,14 +16,14 @@ |
3508 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3509 | */ |
3510 | |
3511 | -#include <QtGui/QClipboard> |
3512 | -#include <QtGui/QGuiApplication> |
3513 | +#include "qquickmimedata_p.h" |
3514 | + |
3515 | #include <QtCore/QMimeData> |
3516 | #include <QtCore/QMimeDatabase> |
3517 | #include <QtCore/QMimeType> |
3518 | -#include "qquickmimedata_p.h" |
3519 | - |
3520 | -#include <QDebug> |
3521 | +#include <QtCore/QDebug> |
3522 | +#include <QtGui/QClipboard> |
3523 | +#include <QtGui/QGuiApplication> |
3524 | |
3525 | UT_NAMESPACE_BEGIN |
3526 | |
3527 | |
3528 | === modified file 'src/UbuntuToolkit/qquickmimedata_p.h' |
3529 | --- src/Ubuntu/UbuntuToolkit/qquickmimedata_p.h 2016-07-07 07:21:48 +0000 |
3530 | +++ src/UbuntuToolkit/qquickmimedata_p.h 2016-09-17 11:46:32 +0000 |
3531 | @@ -16,14 +16,15 @@ |
3532 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3533 | */ |
3534 | |
3535 | -#ifndef QQUICKMIMEDATA_H |
3536 | -#define QQUICKMIMEDATA_H |
3537 | +#ifndef QQUICKMIMEDATA_P_H |
3538 | +#define QQUICKMIMEDATA_P_H |
3539 | |
3540 | #include <QtCore/QMimeData> |
3541 | #include <QtCore/QStringList> |
3542 | +#include <QtCore/QUrl> |
3543 | #include <QtGui/QColor> |
3544 | -#include <QtCore/QUrl> |
3545 | -#include "qquickclipboard_p.h" |
3546 | + |
3547 | +#include <UbuntuToolkit/private/qquickclipboard_p.h> |
3548 | |
3549 | UT_NAMESPACE_BEGIN |
3550 | |
3551 | @@ -74,4 +75,4 @@ |
3552 | |
3553 | UT_NAMESPACE_END |
3554 | |
3555 | -#endif // QQUICKMIMEDATA_H |
3556 | +#endif // QQUICKMIMEDATA_P_H |
3557 | |
3558 | === modified file 'src/UbuntuToolkit/quickutils.cpp' |
3559 | --- src/Ubuntu/UbuntuToolkit/quickutils.cpp 2016-07-07 07:21:48 +0000 |
3560 | +++ src/UbuntuToolkit/quickutils.cpp 2016-09-17 11:46:32 +0000 |
3561 | @@ -12,23 +12,21 @@ |
3562 | * |
3563 | * You should have received a copy of the GNU Lesser General Public License |
3564 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3565 | - * |
3566 | */ |
3567 | |
3568 | #include "quickutils_p.h" |
3569 | |
3570 | -#include <QGuiApplication> |
3571 | -#include <QtQuick/QQuickView> |
3572 | -#include <QtQuick/QQuickItem> |
3573 | -#include <QtQml/QQmlContext> |
3574 | #include <QtCore/QAbstractListModel> |
3575 | #include <QtCore/QAbstractProxyModel> |
3576 | +#include <QtGui/QGuiApplication> |
3577 | +#include <QtQml/QQmlContext> |
3578 | #include <QtQml/QQmlPropertyMap> |
3579 | #include <QtQml/QQmlInfo> |
3580 | #include <QtQml/QQmlEngine> |
3581 | - |
3582 | -#include <private/qquicktextinput_p.h> |
3583 | -#include <private/qquicktextedit_p.h> |
3584 | +#include <QtQuick/QQuickView> |
3585 | +#include <QtQuick/QQuickItem> |
3586 | +#include <QtQuick/private/qquicktextinput_p.h> |
3587 | +#include <QtQuick/private/qquicktextedit_p.h> |
3588 | |
3589 | UT_NAMESPACE_BEGIN |
3590 | |
3591 | @@ -36,6 +34,7 @@ |
3592 | |
3593 | QuickUtils::QuickUtils(QObject *parent) : |
3594 | QObject(parent), |
3595 | + m_rootWindow(0), |
3596 | m_rootView(0), |
3597 | m_mouseAttached(false), |
3598 | m_keyboardAttached(false) |
3599 | @@ -86,7 +85,7 @@ |
3600 | // make sure we have the m_rootView updated |
3601 | lookupQuickView(); |
3602 | if (!object) { |
3603 | - return (m_rootView) ? m_rootView->rootObject() : 0; |
3604 | + return m_rootView ? m_rootView->rootObject() : (m_rootWindow ? m_rootWindow->contentItem() : 0); |
3605 | } |
3606 | |
3607 | QQuickItem *item = qobject_cast<QQuickItem*>(object); |
3608 | @@ -175,9 +174,10 @@ |
3609 | */ |
3610 | void QuickUtils::lookupQuickView() |
3611 | { |
3612 | - if (m_rootView) |
3613 | + if (m_rootWindow) |
3614 | return; |
3615 | Q_FOREACH (QWindow *w, QGuiApplication::topLevelWindows()) { |
3616 | + m_rootWindow = qobject_cast<QQuickWindow*>(w); |
3617 | m_rootView = qobject_cast<QQuickView*>(w); |
3618 | if (m_rootView) { |
3619 | // connect in case we get the root object changed |
3620 | |
3621 | === modified file 'src/UbuntuToolkit/quickutils_p.h' |
3622 | --- src/Ubuntu/UbuntuToolkit/quickutils_p.h 2016-07-07 07:21:48 +0000 |
3623 | +++ src/UbuntuToolkit/quickutils_p.h 2016-09-17 11:46:32 +0000 |
3624 | @@ -12,7 +12,6 @@ |
3625 | * |
3626 | * You should have received a copy of the GNU Lesser General Public License |
3627 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3628 | - * |
3629 | */ |
3630 | |
3631 | #ifndef QUICKUTILS_P_H |
3632 | @@ -21,7 +20,8 @@ |
3633 | #include <QtCore/QObject> |
3634 | #include <QtCore/QPointer> |
3635 | #include <QtQuick/QQuickView> |
3636 | -#include <ubuntutoolkitglobal.h> |
3637 | + |
3638 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3639 | |
3640 | class QQuickItem; |
3641 | class QQmlEngine; |
3642 | @@ -85,6 +85,7 @@ |
3643 | |
3644 | private: |
3645 | explicit QuickUtils(QObject *parent = 0); |
3646 | + QPointer<QQuickWindow> m_rootWindow; |
3647 | QPointer<QQuickView> m_rootView; |
3648 | QStringList m_omitIM; |
3649 | bool m_mouseAttached; |
3650 | |
3651 | === modified file 'src/UbuntuToolkit/sortbehavior_p.h' |
3652 | --- src/Ubuntu/UbuntuToolkit/sortbehavior_p.h 2016-07-07 07:21:48 +0000 |
3653 | +++ src/UbuntuToolkit/sortbehavior_p.h 2016-09-17 11:46:32 +0000 |
3654 | @@ -17,11 +17,12 @@ |
3655 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3656 | */ |
3657 | |
3658 | -#ifndef SORTBEHAVIOR_H |
3659 | -#define SORTBEHAVIOR_H |
3660 | - |
3661 | -#include <QSortFilterProxyModel> |
3662 | -#include <ubuntutoolkitglobal.h> |
3663 | +#ifndef SORTBEHAVIOR_P_H |
3664 | +#define SORTBEHAVIOR_P_H |
3665 | + |
3666 | +#include <QtCore/QSortFilterProxyModel> |
3667 | + |
3668 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3669 | |
3670 | UT_NAMESPACE_BEGIN |
3671 | |
3672 | @@ -50,4 +51,4 @@ |
3673 | |
3674 | UT_NAMESPACE_END |
3675 | |
3676 | -#endif // SORTBEHAVIOR_H |
3677 | +#endif // SORTBEHAVIOR_P_H |
3678 | |
3679 | === modified file 'src/UbuntuToolkit/sortfiltermodel_p.h' |
3680 | --- src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h 2016-08-16 08:43:28 +0000 |
3681 | +++ src/UbuntuToolkit/sortfiltermodel_p.h 2016-09-17 11:46:32 +0000 |
3682 | @@ -18,12 +18,13 @@ |
3683 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3684 | */ |
3685 | |
3686 | -#ifndef QSORTFILTERPROXYMODELQML_H |
3687 | -#define QSORTFILTERPROXYMODELQML_H |
3688 | - |
3689 | -#include <QSortFilterProxyModel> |
3690 | -#include "sortbehavior_p.h" |
3691 | -#include "filterbehavior_p.h" |
3692 | +#ifndef SORTFILTERMODEL_P_H |
3693 | +#define SORTFILTERMODEL_P_H |
3694 | + |
3695 | +#include <QtCore/QSortFilterProxyModel> |
3696 | + |
3697 | +#include <UbuntuToolkit/private/sortbehavior_p.h> |
3698 | +#include <UbuntuToolkit/private/filterbehavior_p.h> |
3699 | |
3700 | UT_NAMESPACE_BEGIN |
3701 | |
3702 | @@ -73,4 +74,4 @@ |
3703 | |
3704 | UT_NAMESPACE_END |
3705 | |
3706 | -#endif // QSORTFILTERPROXYMODELQML_H |
3707 | +#endif // SORTFILTERMODEL_P_H |
3708 | |
3709 | === modified file 'src/UbuntuToolkit/splitview.cpp' |
3710 | --- src/Ubuntu/UbuntuToolkit/splitview.cpp 2016-08-11 14:47:05 +0000 |
3711 | +++ src/UbuntuToolkit/splitview.cpp 2016-09-17 11:46:32 +0000 |
3712 | @@ -16,16 +16,15 @@ |
3713 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3714 | */ |
3715 | |
3716 | +#include "splitview_p_p.h" |
3717 | + |
3718 | +#include <QtQml/QQmlInfo> |
3719 | +#include <QtQuick/private/qquickanchors_p.h> |
3720 | #include <QtQuick/private/qquickitem_p.h> |
3721 | -#include <QtQuick/private/qquickanchors_p.h> |
3722 | -#include <QtQml/QQmlInfo> |
3723 | |
3724 | -#include "splitview_p.h" |
3725 | -#include "splitview_p_p.h" |
3726 | #include "ucunits_p.h" |
3727 | #include "ucpagetreenode_p.h" |
3728 | - |
3729 | -#include "privates/splitviewhandler_p_p.h" |
3730 | +#include "privates/splitviewhandler_p.h" |
3731 | |
3732 | #define DEFAULT_SPACING_DP 4 |
3733 | |
3734 | |
3735 | === modified file 'src/UbuntuToolkit/splitview_p.h' |
3736 | --- src/Ubuntu/UbuntuToolkit/splitview_p.h 2016-08-09 13:23:04 +0000 |
3737 | +++ src/UbuntuToolkit/splitview_p.h 2016-09-17 11:46:32 +0000 |
3738 | @@ -21,7 +21,7 @@ |
3739 | |
3740 | #include <QtQuick/private/qquickpositioners_p.h> |
3741 | |
3742 | -#include "ubuntutoolkitglobal.h" |
3743 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3744 | |
3745 | UT_NAMESPACE_BEGIN |
3746 | |
3747 | |
3748 | === modified file 'src/UbuntuToolkit/splitview_p_p.h' |
3749 | --- src/Ubuntu/UbuntuToolkit/splitview_p_p.h 2016-08-10 07:34:04 +0000 |
3750 | +++ src/UbuntuToolkit/splitview_p_p.h 2016-09-17 11:46:32 +0000 |
3751 | @@ -19,7 +19,8 @@ |
3752 | #ifndef SPLITVIEW_P_P_H |
3753 | #define SPLITVIEW_P_P_H |
3754 | |
3755 | -#include "splitview_p.h" |
3756 | +#include <UbuntuToolkit/private/splitview_p.h> |
3757 | + |
3758 | #include <QtCore/private/qobject_p.h> |
3759 | |
3760 | UT_NAMESPACE_BEGIN |
3761 | |
3762 | === modified file 'src/UbuntuToolkit/splitviewlayout.cpp' |
3763 | --- src/Ubuntu/UbuntuToolkit/splitviewlayout.cpp 2016-08-11 14:07:52 +0000 |
3764 | +++ src/UbuntuToolkit/splitviewlayout.cpp 2016-09-17 11:46:32 +0000 |
3765 | @@ -15,12 +15,12 @@ |
3766 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
3767 | */ |
3768 | |
3769 | +#include "splitview_p_p.h" |
3770 | + |
3771 | +#include <QtQuick/private/qquickanchors_p.h> |
3772 | #include <QtQuick/private/qquickitem_p.h> |
3773 | -#include <QtQuick/private/qquickanchors_p.h> |
3774 | #include <QtQml/QQmlInfo> |
3775 | |
3776 | -#include "splitview_p.h" |
3777 | -#include "splitview_p_p.h" |
3778 | #include "ucmathutils_p.h" |
3779 | |
3780 | UT_NAMESPACE_BEGIN |
3781 | |
3782 | === modified file 'src/UbuntuToolkit/statesaverbackend_p.cpp' |
3783 | --- src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp 2016-07-07 07:21:48 +0000 |
3784 | +++ src/UbuntuToolkit/statesaverbackend_p.cpp 2016-09-17 11:46:32 +0000 |
3785 | @@ -17,18 +17,19 @@ |
3786 | */ |
3787 | |
3788 | #include "statesaverbackend_p.h" |
3789 | -#include "ucapplication_p.h" |
3790 | -#include <QtQml/QQmlContext> |
3791 | -#include <QtQml/QQmlProperty> |
3792 | -#include <QtQml/qqmlinfo.h> |
3793 | -#include <QtQml/qqml.h> |
3794 | + |
3795 | #include <QtCore/QCoreApplication> |
3796 | #include <QtCore/QFile> |
3797 | +#include <QtCore/QStandardPaths> |
3798 | #include <QtCore/QStringList> |
3799 | +#include <QtQml/QtQml> |
3800 | +#include <QtQml/QQmlContext> |
3801 | +#include <QtQml/QQmlInfo> |
3802 | +#include <QtQml/QQmlProperty> |
3803 | + |
3804 | #include "i18n_p.h" |
3805 | #include "quickutils_p.h" |
3806 | -#include <QtCore/QStandardPaths> |
3807 | - |
3808 | +#include "ucapplication_p.h" |
3809 | #include "unixsignalhandler_p.h" |
3810 | |
3811 | UT_NAMESPACE_BEGIN |
3812 | |
3813 | === modified file 'src/UbuntuToolkit/statesaverbackend_p.h' |
3814 | --- src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h 2016-07-06 09:51:06 +0000 |
3815 | +++ src/UbuntuToolkit/statesaverbackend_p.h 2016-09-17 11:46:32 +0000 |
3816 | @@ -20,12 +20,13 @@ |
3817 | #define STATESAVERBACKEND_P_H |
3818 | |
3819 | #include <QtCore/QObject> |
3820 | -#include <QtCore/QSettings> |
3821 | #include <QtCore/QPointer> |
3822 | #include <QtCore/QSet> |
3823 | +#include <QtCore/QSettings> |
3824 | +#include <QtCore/QStack> |
3825 | #include <QtCore/QTimer> |
3826 | -#include <QtCore/QStack> |
3827 | -#include <ubuntutoolkitglobal.h> |
3828 | + |
3829 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3830 | |
3831 | UT_NAMESPACE_BEGIN |
3832 | |
3833 | |
3834 | === modified file 'src/UbuntuToolkit/timeutils_p.h' |
3835 | --- src/Ubuntu/UbuntuToolkit/timeutils_p.h 2016-07-07 07:21:48 +0000 |
3836 | +++ src/UbuntuToolkit/timeutils_p.h 2016-09-17 11:46:32 +0000 |
3837 | @@ -17,12 +17,12 @@ |
3838 | #ifndef TIMEUTILS_P_H |
3839 | #define TIMEUTILS_P_H |
3840 | |
3841 | -#include "livetimer_p.h" |
3842 | +#include <QtCore/QDateTime> |
3843 | +#include <QtCore/QLocale> |
3844 | +#include <QtCore/QObject> |
3845 | +#include <QtCore/QTimer> |
3846 | |
3847 | -#include <QDateTime> |
3848 | -#include <QLocale> |
3849 | -#include <QObject> |
3850 | -#include <QTimer> |
3851 | +#include <UbuntuToolkit/private/livetimer_p.h> |
3852 | |
3853 | UT_NAMESPACE_BEGIN |
3854 | |
3855 | |
3856 | === renamed directory 'src/Ubuntu/Components/tools' => 'src/UbuntuToolkit/tools' |
3857 | === modified file 'src/UbuntuToolkit/tree.cpp' |
3858 | --- src/Ubuntu/UbuntuToolkit/tree.cpp 2016-07-07 07:21:48 +0000 |
3859 | +++ src/UbuntuToolkit/tree.cpp 2016-09-17 11:46:32 +0000 |
3860 | @@ -16,8 +16,8 @@ |
3861 | |
3862 | #include "tree_p.h" |
3863 | |
3864 | -#include <private/qobject_p.h> |
3865 | -#include <QQmlEngine> |
3866 | +#include <QtCore/private/qobject_p.h> |
3867 | +#include <QtQml/QQmlEngine> |
3868 | |
3869 | UT_NAMESPACE_BEGIN |
3870 | |
3871 | |
3872 | === modified file 'src/UbuntuToolkit/tree_p.h' |
3873 | --- src/Ubuntu/UbuntuToolkit/tree_p.h 2016-07-07 07:21:48 +0000 |
3874 | +++ src/UbuntuToolkit/tree_p.h 2016-09-17 11:46:32 +0000 |
3875 | @@ -14,12 +14,13 @@ |
3876 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3877 | */ |
3878 | |
3879 | -#ifndef TREE_H |
3880 | -#define TREE_H |
3881 | - |
3882 | -#include <QObject> |
3883 | -#include <QVariant> |
3884 | -#include "ubuntutoolkitglobal.h" |
3885 | +#ifndef TREE_P_H |
3886 | +#define TREE_P_H |
3887 | + |
3888 | +#include <QtCore/QObject> |
3889 | +#include <QtCore/QVariant> |
3890 | + |
3891 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
3892 | |
3893 | UT_NAMESPACE_BEGIN |
3894 | |
3895 | @@ -45,4 +46,4 @@ |
3896 | |
3897 | UT_NAMESPACE_END |
3898 | |
3899 | -#endif // TREE_H |
3900 | +#endif // TREE_P_H |
3901 | |
3902 | === modified file 'src/UbuntuToolkit/ubuntutoolkitglobal.h' |
3903 | --- src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h 2016-07-08 14:28:48 +0000 |
3904 | +++ src/UbuntuToolkit/ubuntutoolkitglobal.h 2016-09-17 11:46:32 +0000 |
3905 | @@ -13,6 +13,7 @@ |
3906 | * You should have received a copy of the GNU Lesser General Public License |
3907 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
3908 | */ |
3909 | + |
3910 | #ifndef UBUNTUTOOLKITGLOBAL_H |
3911 | #define UBUNTUTOOLKITGLOBAL_H |
3912 | |
3913 | @@ -54,4 +55,3 @@ |
3914 | #endif |
3915 | |
3916 | #endif // UBUNTUTOOLKITGLOBAL_H |
3917 | - |
3918 | |
3919 | === modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.cpp' |
3920 | --- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp 2016-08-26 12:03:35 +0000 |
3921 | +++ src/UbuntuToolkit/ubuntutoolkitmodule.cpp 2016-09-17 11:46:32 +0000 |
3922 | @@ -17,91 +17,89 @@ |
3923 | */ |
3924 | |
3925 | #include "ubuntutoolkitmodule.h" |
3926 | + |
3927 | +#include <sys/types.h> |
3928 | +#include <unistd.h> |
3929 | + |
3930 | +#include <stdexcept> |
3931 | + |
3932 | +#include <QtQml/QQmlContext> |
3933 | #include <QtQml/QQmlEngine> |
3934 | -#include <QtQml/QQmlContext> |
3935 | #include <QtQml/QQmlExtensionPlugin> |
3936 | #include <QtQuick/private/qquickimagebase_p.h> |
3937 | -#include <QDBusConnection> |
3938 | +#include <QtDBus/QDBusConnection> |
3939 | #include <QtGui/QGuiApplication> |
3940 | #include <QtGui/QScreen> |
3941 | - |
3942 | -#include <sys/types.h> |
3943 | -#include <unistd.h> |
3944 | -#include <stdexcept> |
3945 | - |
3946 | -#include <ucunits_p.h> |
3947 | -#include <quickutils_p.h> |
3948 | -#include <i18n_p.h> |
3949 | -#include <ucapplication_p.h> |
3950 | -#include <ucfontutils_p.h> |
3951 | -#include <uctheme_p.h> |
3952 | -#include <ucdeprecatedtheme_p.h> |
3953 | -#include <listener_p.h> |
3954 | -#include <ucfontutils_p.h> |
3955 | -#include <ucmathutils_p.h> |
3956 | -#include <ucmargins_p.h> |
3957 | -#include <ucmainviewbase_p.h> |
3958 | -#include <ucabstractbutton_p.h> |
3959 | -#include <ucaction_p.h> |
3960 | -#include <ucactioncontext_p.h> |
3961 | -#include <ucactionitem_p.h> |
3962 | -#include <ucactionmanager_p.h> |
3963 | -#include <ucalarm_p.h> |
3964 | -#include <ucalarmmodel_p.h> |
3965 | -#include <ucarguments_p.h> |
3966 | -#include <ucargument_p.h> |
3967 | -#include <ucbottomedgehint_p.h> |
3968 | -#include <ucbottomedgeregion_p.h> |
3969 | -#include <ucbottomedge_p.h> |
3970 | -#include <uchaptics_p.h> |
3971 | -#include <ucheader_p.h> |
3972 | -#include <ucinversemouse_p.h> |
3973 | -#include <ucmouse_p.h> |
3974 | -#include <uclistitem_p.h> |
3975 | -#include <uclistitemactions_p.h> |
3976 | -#include <uclistitemlayout_p.h> |
3977 | -#include <uclabel_p.h> |
3978 | -#include <ucpagetreenode_p.h> |
3979 | -#include <ucperformancemonitor_p.h> |
3980 | -#include <ucproportionalshape_p.h> |
3981 | -#include <ucscalingimageprovider_p.h> |
3982 | -#include <ucserviceproperties_p.h> |
3983 | -#include <ucslotslayout_p.h> |
3984 | -#include <ucstatesaver_p.h> |
3985 | -#include <ucstyleditembase_p.h> |
3986 | -#include <ucstylehints_p.h> |
3987 | -#include <uctheme_p.h> |
3988 | -#include <ucubuntuanimation_p.h> |
3989 | -#include <ucubuntushapeoverlay_p.h> |
3990 | -#include <ucubuntushape_p.h> |
3991 | -#include <ucurihandler_p.h> |
3992 | -#include <ucqquickimageextension_p.h> |
3993 | -#include <inversemouseareatype_p.h> |
3994 | -#include <qquickclipboard_p.h> |
3995 | -#include <qquickmimedata_p.h> |
3996 | -#include <colorutils_p.h> |
3997 | -#include <tree_p.h> |
3998 | -#include <unitythemeiconprovider_p.h> |
3999 | -#include <sortbehavior_p.h> |
4000 | -#include <sortfiltermodel_p.h> |
4001 | -#include <livetimer_p.h> |
4002 | -#include <privates/frame_p.h> |
4003 | -#include <privates/ucpagewrapper_p.h> |
4004 | -#include <privates/appheaderbase_p.h> |
4005 | -#include <privates/ucscrollbarutils_p.h> |
4006 | -#include <actionlist_p.h> |
4007 | -#include <exclusivegroup_p.h> |
4008 | -#include <menu_p.h> |
4009 | -#include <menubar_p.h> |
4010 | -#include <menugroup_p.h> |
4011 | - |
4012 | -#include <splitview_p.h> |
4013 | - |
4014 | -// styles |
4015 | -#include <ucbottomedgestyle_p.h> |
4016 | - |
4017 | #include <UbuntuMetrics/applicationmonitor.h> |
4018 | |
4019 | +#include "actionlist_p.h" |
4020 | +#include "colorutils_p.h" |
4021 | +#include "exclusivegroup_p.h" |
4022 | +#include "i18n_p.h" |
4023 | +#include "inversemouseareatype_p.h" |
4024 | +#include "listener_p.h" |
4025 | +#include "livetimer_p.h" |
4026 | +#include "menu_p.h" |
4027 | +#include "menubar_p.h" |
4028 | +#include "menugroup_p.h" |
4029 | +#include "privates/appheaderbase_p.h" |
4030 | +#include "privates/frame_p.h" |
4031 | +#include "privates/ucpagewrapper_p.h" |
4032 | +#include "privates/ucscrollbarutils_p.h" |
4033 | +#include "qquickclipboard_p.h" |
4034 | +#include "qquickmimedata_p.h" |
4035 | +#include "quickutils_p.h" |
4036 | +#include "sortbehavior_p.h" |
4037 | +#include "sortfiltermodel_p.h" |
4038 | +#include "splitview_p.h" |
4039 | +#include "tree_p.h" |
4040 | +#include "ucabstractbutton_p.h" |
4041 | +#include "ucaction_p.h" |
4042 | +#include "ucactioncontext_p.h" |
4043 | +#include "ucactionitem_p.h" |
4044 | +#include "ucactionmanager_p.h" |
4045 | +#include "ucalarm_p.h" |
4046 | +#include "ucalarmmodel_p.h" |
4047 | +#include "ucapplication_p.h" |
4048 | +#include "ucargument_p.h" |
4049 | +#include "ucarguments_p.h" |
4050 | +#include "ucbottomedge_p.h" |
4051 | +#include "ucbottomedgehint_p.h" |
4052 | +#include "ucbottomedgeregion_p.h" |
4053 | +#include "ucbottomedgestyle_p.h" |
4054 | +#include "ucdeprecatedtheme_p.h" |
4055 | +#include "ucfontutils_p.h" |
4056 | +#include "ucfontutils_p.h" |
4057 | +#include "uchaptics_p.h" |
4058 | +#include "ucheader_p.h" |
4059 | +#include "ucinversemouse_p.h" |
4060 | +#include "uclabel_p.h" |
4061 | +#include "uclistitem_p.h" |
4062 | +#include "uclistitemactions_p.h" |
4063 | +#include "uclistitemlayout_p.h" |
4064 | +#include "ucmainviewbase_p.h" |
4065 | +#include "ucmargins_p.h" |
4066 | +#include "ucmathutils_p.h" |
4067 | +#include "ucmouse_p.h" |
4068 | +#include "ucpagetreenode_p.h" |
4069 | +#include "ucperformancemonitor_p.h" |
4070 | +#include "ucproportionalshape_p.h" |
4071 | +#include "ucqquickimageextension_p.h" |
4072 | +#include "ucscalingimageprovider_p.h" |
4073 | +#include "ucserviceproperties_p.h" |
4074 | +#include "ucslotslayout_p.h" |
4075 | +#include "ucstatesaver_p.h" |
4076 | +#include "ucstyleditembase_p.h" |
4077 | +#include "ucstylehints_p.h" |
4078 | +#include "uctheme_p.h" |
4079 | +#include "uctheme_p.h" |
4080 | +#include "ucubuntuanimation_p.h" |
4081 | +#include "ucubuntushape_p.h" |
4082 | +#include "ucubuntushapeoverlay_p.h" |
4083 | +#include "ucunits_p.h" |
4084 | +#include "ucurihandler_p.h" |
4085 | +#include "unitythemeiconprovider_p.h" |
4086 | + |
4087 | UT_NAMESPACE_BEGIN |
4088 | |
4089 | const char *EngineProperty("__ubuntu_toolkit_plugin_data"); |
4090 | |
4091 | === modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.h' |
4092 | --- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h 2016-07-06 09:51:06 +0000 |
4093 | +++ src/UbuntuToolkit/ubuntutoolkitmodule.h 2016-09-17 11:46:32 +0000 |
4094 | @@ -20,10 +20,11 @@ |
4095 | #define UBUNTUTOOLKITMODULE_H |
4096 | |
4097 | #include <QtCore/QObject> |
4098 | +#include <QtQml/QtQml> |
4099 | +#include <QtQml/QJSEngine> |
4100 | #include <QtQml/QQmlEngine> |
4101 | -#include <QtQml/QJSEngine> |
4102 | -#include <qqml.h> |
4103 | -#include <ubuntutoolkitglobal.h> |
4104 | + |
4105 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4106 | |
4107 | class QQmlEngine; |
4108 | class QWindow; |
4109 | |
4110 | === modified file 'src/UbuntuToolkit/ucabstractbutton.cpp' |
4111 | --- src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp 2016-08-17 10:06:06 +0000 |
4112 | +++ src/UbuntuToolkit/ucabstractbutton.cpp 2016-09-17 11:46:32 +0000 |
4113 | @@ -15,12 +15,14 @@ |
4114 | */ |
4115 | |
4116 | #include "ucabstractbutton_p_p.h" |
4117 | + |
4118 | +#include <QtQml/private/qqmlglobal_p.h> |
4119 | +#include <QtQuick/private/qquickitem_p.h> |
4120 | +#include <QtQuick/private/qquickmousearea_p.h> |
4121 | + |
4122 | +#include "ucaction_p.h" |
4123 | #include "uchaptics_p.h" |
4124 | #include "ucunits_p.h" |
4125 | -#include "ucaction_p.h" |
4126 | -#include <QtQuick/private/qquickitem_p.h> |
4127 | -#include <QtQuick/private/qquickmousearea_p.h> |
4128 | -#include <QtQml/private/qqmlglobal_p.h> |
4129 | |
4130 | #define MIN_SENSING_WIDTH_GU 4 |
4131 | #define MIN_SENSING_HEIGHT_GU 4 |
4132 | |
4133 | === modified file 'src/UbuntuToolkit/ucabstractbutton_p.h' |
4134 | --- src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h 2016-07-07 07:21:48 +0000 |
4135 | +++ src/UbuntuToolkit/ucabstractbutton_p.h 2016-09-17 11:46:32 +0000 |
4136 | @@ -14,13 +14,14 @@ |
4137 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4138 | */ |
4139 | |
4140 | -#ifndef UCABSTRACTBUTTON_H |
4141 | -#define UCABSTRACTBUTTON_H |
4142 | +#ifndef UCABSTRACTBUTTON_P_H |
4143 | +#define UCABSTRACTBUTTON_P_H |
4144 | |
4145 | -#include "ucactionitem_p.h" |
4146 | -#include "ucmargins_p.h" |
4147 | #include <QtQuick/private/qquickevents_p_p.h> |
4148 | |
4149 | +#include <UbuntuToolkit/private/ucactionitem_p.h> |
4150 | +#include <UbuntuToolkit/private/ucmargins_p.h> |
4151 | + |
4152 | class QQuickMouseArea; |
4153 | class QQuickMouseEvent; |
4154 | |
4155 | @@ -84,4 +85,4 @@ |
4156 | |
4157 | QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCMargins)) |
4158 | |
4159 | -#endif // UCABSTRACTBUTTON_H |
4160 | +#endif // UCABSTRACTBUTTON_P_H |
4161 | |
4162 | === modified file 'src/UbuntuToolkit/ucabstractbutton_p_p.h' |
4163 | --- src/Ubuntu/UbuntuToolkit/ucabstractbutton_p_p.h 2016-07-07 07:21:48 +0000 |
4164 | +++ src/UbuntuToolkit/ucabstractbutton_p_p.h 2016-09-17 11:46:32 +0000 |
4165 | @@ -14,11 +14,12 @@ |
4166 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4167 | */ |
4168 | |
4169 | -#ifndef UCABSTRACTBUTTON_P |
4170 | -#define UCABSTRACTBUTTON_P |
4171 | - |
4172 | -#include "ucabstractbutton_p.h" |
4173 | -#include "ucactionitem_p_p.h" |
4174 | +#ifndef UCABSTRACTBUTTON_P_P_H |
4175 | +#define UCABSTRACTBUTTON_P_P_H |
4176 | + |
4177 | +#include <UbuntuToolkit/private/ucabstractbutton_p.h> |
4178 | + |
4179 | +#include <UbuntuToolkit/private/ucactionitem_p_p.h> |
4180 | |
4181 | UT_NAMESPACE_BEGIN |
4182 | |
4183 | @@ -54,4 +55,4 @@ |
4184 | |
4185 | UT_NAMESPACE_END |
4186 | |
4187 | -#endif // UCABSTRACTBUTTON_P |
4188 | +#endif // UCABSTRACTBUTTON_P_P_H |
4189 | |
4190 | === modified file 'src/UbuntuToolkit/ucaction.cpp' |
4191 | --- src/Ubuntu/UbuntuToolkit/ucaction.cpp 2016-08-25 14:00:43 +0000 |
4192 | +++ src/UbuntuToolkit/ucaction.cpp 2016-09-17 11:46:32 +0000 |
4193 | @@ -15,15 +15,16 @@ |
4194 | */ |
4195 | |
4196 | #include "ucaction_p.h" |
4197 | + |
4198 | +#include <QtCore/QtDebug> |
4199 | +#include <QtGui/private/qguiapplication_p.h> |
4200 | +#include <QtQml/QQmlInfo> |
4201 | +#include <QtQuick/QQuickItem> |
4202 | +#include <QtQuick/QQuickWindow> |
4203 | + |
4204 | +#include "exclusivegroup_p.h" |
4205 | #include "quickutils_p.h" |
4206 | #include "ucactioncontext_p.h" |
4207 | -#include "exclusivegroup_p.h" |
4208 | - |
4209 | -#include <QtDebug> |
4210 | -#include <QtQml/QQmlInfo> |
4211 | -#include <QtQuick/qquickitem.h> |
4212 | -#include <QtQuick/qquickwindow.h> |
4213 | -#include <private/qguiapplication_p.h> |
4214 | |
4215 | Q_LOGGING_CATEGORY(ucAction, "ubuntu.components.Action", QtMsgType::QtWarningMsg) |
4216 | |
4217 | @@ -364,6 +365,14 @@ |
4218 | if (m_iconSource == url) { |
4219 | return; |
4220 | } |
4221 | + if (url.isEmpty() && m_factoryIconSource) { |
4222 | + // Prevent overriding iconSource when it is a binding to a property with |
4223 | + // an empty value at initialization, and the value of iconName is initialized |
4224 | + // before iconSource is initialized which would cause first iconSource to be set, |
4225 | + // and after that iconSource to be reset to the empty value of the binding. |
4226 | + // Fixes bug #1616858. |
4227 | + return; |
4228 | + } |
4229 | m_iconSource = url; |
4230 | m_factoryIconSource = false; |
4231 | Q_EMIT iconSourceChanged(); |
4232 | |
4233 | === modified file 'src/UbuntuToolkit/ucaction_p.h' |
4234 | --- src/Ubuntu/UbuntuToolkit/ucaction_p.h 2016-08-25 14:00:43 +0000 |
4235 | +++ src/UbuntuToolkit/ucaction_p.h 2016-09-17 11:46:32 +0000 |
4236 | @@ -14,17 +14,18 @@ |
4237 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4238 | */ |
4239 | |
4240 | -#ifndef UCACTION_H |
4241 | -#define UCACTION_H |
4242 | +#ifndef UCACTION_P_H |
4243 | +#define UCACTION_P_H |
4244 | |
4245 | #include <QtCore/QObject> |
4246 | +#include <QtCore/QUrl> |
4247 | #include <QtCore/QVariant> |
4248 | -#include <QtCore/QUrl> |
4249 | #include <QtGui/QKeySequence> |
4250 | -#include <QtQml> |
4251 | +#include <QtQml/QtQml> |
4252 | #include <QtQml/QQmlListProperty> |
4253 | #include <QtQml/private/qpodvector_p.h> |
4254 | -#include "ubuntutoolkitglobal.h" |
4255 | + |
4256 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4257 | |
4258 | class QQmlComponent; |
4259 | class QQuickItem; |
4260 | @@ -191,4 +192,4 @@ |
4261 | |
4262 | QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCAction)) |
4263 | |
4264 | -#endif // UCACTION_H |
4265 | +#endif // UCACTION_P_H |
4266 | |
4267 | === modified file 'src/UbuntuToolkit/ucactioncontext.cpp' |
4268 | --- src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp 2016-07-07 07:21:48 +0000 |
4269 | +++ src/UbuntuToolkit/ucactioncontext.cpp 2016-09-17 11:46:32 +0000 |
4270 | @@ -15,9 +15,11 @@ |
4271 | */ |
4272 | |
4273 | #include "ucactioncontext_p.h" |
4274 | + |
4275 | +#include <QtQuick/QQuickItem> |
4276 | + |
4277 | +#include "adapters/actionsproxy_p.h" |
4278 | #include "ucaction_p.h" |
4279 | -#include "adapters/actionsproxy_p.h" |
4280 | -#include <QtQuick/QQuickItem> |
4281 | |
4282 | Q_LOGGING_CATEGORY(ucActionContext, "ubuntu.components.ActionContext", QtMsgType::QtWarningMsg) |
4283 | |
4284 | |
4285 | === modified file 'src/UbuntuToolkit/ucactioncontext_p.h' |
4286 | --- src/Ubuntu/UbuntuToolkit/ucactioncontext_p.h 2016-07-07 07:21:48 +0000 |
4287 | +++ src/UbuntuToolkit/ucactioncontext_p.h 2016-09-17 11:46:32 +0000 |
4288 | @@ -14,15 +14,16 @@ |
4289 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4290 | */ |
4291 | |
4292 | -#ifndef UCACTIONCONTEXT_H |
4293 | -#define UCACTIONCONTEXT_H |
4294 | +#ifndef UCACTIONCONTEXT_P_H |
4295 | +#define UCACTIONCONTEXT_P_H |
4296 | |
4297 | #include <QtCore/QObject> |
4298 | +#include <QtCore/QSet> |
4299 | +#include <QtQml/QtQml> |
4300 | #include <QtQml/QQmlListProperty> |
4301 | #include <QtQml/QQmlParserStatus> |
4302 | -#include <QtCore/QSet> |
4303 | -#include <QtQml> |
4304 | -#include "ubuntutoolkitglobal.h" |
4305 | + |
4306 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4307 | |
4308 | class QQuickItem; |
4309 | |
4310 | @@ -111,4 +112,4 @@ |
4311 | QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCActionContext)) |
4312 | QML_DECLARE_TYPEINFO(UT_PREPEND_NAMESPACE(UCActionContext), QML_HAS_ATTACHED_PROPERTIES) |
4313 | |
4314 | -#endif // UCACTIONCONTEXT_H |
4315 | +#endif // UCACTIONCONTEXT_P_H |
4316 | |
4317 | === modified file 'src/UbuntuToolkit/ucactionitem.cpp' |
4318 | --- src/Ubuntu/UbuntuToolkit/ucactionitem.cpp 2016-07-07 08:42:42 +0000 |
4319 | +++ src/UbuntuToolkit/ucactionitem.cpp 2016-09-17 11:46:32 +0000 |
4320 | @@ -15,12 +15,14 @@ |
4321 | */ |
4322 | |
4323 | #include "ucactionitem_p_p.h" |
4324 | -#include "ucaction_p.h" |
4325 | -#include "ucstyleditembase_p_p.h" |
4326 | + |
4327 | #define foreach Q_FOREACH |
4328 | #include <QtQml/private/qqmlbinding_p.h> |
4329 | #undef foreach |
4330 | |
4331 | +#include "ucaction_p.h" |
4332 | +#include "ucstyleditembase_p_p.h" |
4333 | + |
4334 | UT_NAMESPACE_BEGIN |
4335 | |
4336 | UCActionItemPrivate::UCActionItemPrivate() |
4337 | |
4338 | === modified file 'src/UbuntuToolkit/ucactionitem_p.h' |
4339 | --- src/Ubuntu/UbuntuToolkit/ucactionitem_p.h 2016-07-07 07:21:48 +0000 |
4340 | +++ src/UbuntuToolkit/ucactionitem_p.h 2016-09-17 11:46:32 +0000 |
4341 | @@ -13,10 +13,11 @@ |
4342 | * You should have received a copy of the GNU Lesser General Public License |
4343 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4344 | */ |
4345 | -#ifndef UCACTIONITEM_H |
4346 | -#define UCACTIONITEM_H |
4347 | - |
4348 | -#include "ucstyleditembase_p.h" |
4349 | + |
4350 | +#ifndef UCACTIONITEM_P_H |
4351 | +#define UCACTIONITEM_P_H |
4352 | + |
4353 | +#include <UbuntuToolkit/private/ucstyleditembase_p.h> |
4354 | |
4355 | UT_NAMESPACE_BEGIN |
4356 | |
4357 | @@ -79,4 +80,4 @@ |
4358 | |
4359 | UT_NAMESPACE_END |
4360 | |
4361 | -#endif // UCACTIONITEM_H |
4362 | +#endif // UCACTIONITEM_P_H |
4363 | |
4364 | === modified file 'src/UbuntuToolkit/ucactionitem_p_p.h' |
4365 | --- src/Ubuntu/UbuntuToolkit/ucactionitem_p_p.h 2016-07-07 07:21:48 +0000 |
4366 | +++ src/UbuntuToolkit/ucactionitem_p_p.h 2016-09-17 11:46:32 +0000 |
4367 | @@ -16,11 +16,12 @@ |
4368 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4369 | */ |
4370 | |
4371 | -#ifndef UCACTIONITEM_P |
4372 | -#define UCACTIONITEM_P |
4373 | - |
4374 | -#include "ucactionitem_p.h" |
4375 | -#include "ucstyleditembase_p_p.h" |
4376 | +#ifndef UCACTIONITEM_P_P_H |
4377 | +#define UCACTIONITEM_P_P_H |
4378 | + |
4379 | +#include <UbuntuToolkit/private/ucactionitem_p.h> |
4380 | + |
4381 | +#include <UbuntuToolkit/private/ucstyleditembase_p_p.h> |
4382 | |
4383 | UT_NAMESPACE_BEGIN |
4384 | |
4385 | @@ -61,5 +62,5 @@ |
4386 | |
4387 | UT_NAMESPACE_END |
4388 | |
4389 | -#endif // UCACTIONITEM_P |
4390 | +#endif // UCACTIONITEM_P_P_H |
4391 | |
4392 | |
4393 | === modified file 'src/UbuntuToolkit/ucactionmanager.cpp' |
4394 | --- src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp 2016-07-07 07:21:48 +0000 |
4395 | +++ src/UbuntuToolkit/ucactionmanager.cpp 2016-09-17 11:46:32 +0000 |
4396 | @@ -15,9 +15,10 @@ |
4397 | */ |
4398 | |
4399 | #include "ucactionmanager_p.h" |
4400 | + |
4401 | #include "adapters/actionsproxy_p.h" |
4402 | +#include "ucaction_p.h" |
4403 | #include "ucactioncontext_p.h" |
4404 | -#include "ucaction_p.h" |
4405 | |
4406 | UT_NAMESPACE_BEGIN |
4407 | |
4408 | |
4409 | === modified file 'src/UbuntuToolkit/ucactionmanager_p.h' |
4410 | --- src/Ubuntu/UbuntuToolkit/ucactionmanager_p.h 2016-07-07 07:21:48 +0000 |
4411 | +++ src/UbuntuToolkit/ucactionmanager_p.h 2016-09-17 11:46:32 +0000 |
4412 | @@ -14,13 +14,14 @@ |
4413 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4414 | */ |
4415 | |
4416 | -#ifndef UCACTIONMANAGER_H |
4417 | -#define UCACTIONMANAGER_H |
4418 | +#ifndef UCACTIONMANAGER_P_H |
4419 | +#define UCACTIONMANAGER_P_H |
4420 | |
4421 | #include <QtCore/QObject> |
4422 | #include <QtQml/QQmlListProperty> |
4423 | #include <QtQml/QQmlParserStatus> |
4424 | -#include "ubuntutoolkitglobal.h" |
4425 | + |
4426 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4427 | |
4428 | UT_NAMESPACE_BEGIN |
4429 | |
4430 | @@ -65,4 +66,4 @@ |
4431 | |
4432 | UT_NAMESPACE_END |
4433 | |
4434 | -#endif // UCACTIONMANAGER_H |
4435 | +#endif // UCACTIONMANAGER_P_H |
4436 | |
4437 | === modified file 'src/UbuntuToolkit/ucalarm.cpp' |
4438 | --- src/Ubuntu/UbuntuToolkit/ucalarm.cpp 2016-07-07 07:56:34 +0000 |
4439 | +++ src/UbuntuToolkit/ucalarm.cpp 2016-09-17 11:46:32 +0000 |
4440 | @@ -17,9 +17,11 @@ |
4441 | */ |
4442 | |
4443 | #include "ucalarm_p_p.h" |
4444 | + |
4445 | +#include <QtQml/QQmlInfo> |
4446 | + |
4447 | #include "alarmmanager_p_p.h" |
4448 | #include "i18n_p.h" |
4449 | -#include <QtQml/QQmlInfo> |
4450 | |
4451 | UT_NAMESPACE_BEGIN |
4452 | |
4453 | |
4454 | === modified file 'src/UbuntuToolkit/ucalarm_p.h' |
4455 | --- src/Ubuntu/UbuntuToolkit/ucalarm_p.h 2016-07-07 07:21:48 +0000 |
4456 | +++ src/UbuntuToolkit/ucalarm_p.h 2016-09-17 11:46:32 +0000 |
4457 | @@ -16,13 +16,14 @@ |
4458 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4459 | */ |
4460 | |
4461 | -#ifndef UCALARM_H |
4462 | -#define UCALARM_H |
4463 | +#ifndef UCALARM_P_H |
4464 | +#define UCALARM_P_H |
4465 | |
4466 | +#include <QtCore/QDateTime> |
4467 | #include <QtCore/QObject> |
4468 | -#include <QtCore/QDateTime> |
4469 | #include <QtCore/QUrl> |
4470 | -#include "ubuntutoolkitglobal.h" |
4471 | + |
4472 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4473 | |
4474 | UT_NAMESPACE_BEGIN |
4475 | |
4476 | @@ -143,4 +144,4 @@ |
4477 | |
4478 | UT_NAMESPACE_END |
4479 | |
4480 | -#endif // UUALARM_H |
4481 | +#endif // UUALARM_P_H |
4482 | |
4483 | === modified file 'src/UbuntuToolkit/ucalarm_p_p.h' |
4484 | --- src/Ubuntu/UbuntuToolkit/ucalarm_p_p.h 2016-07-07 07:21:48 +0000 |
4485 | +++ src/UbuntuToolkit/ucalarm_p_p.h 2016-09-17 11:46:32 +0000 |
4486 | @@ -16,15 +16,17 @@ |
4487 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4488 | */ |
4489 | |
4490 | -#ifndef UCALARM_P_H |
4491 | -#define UCALARM_P_H |
4492 | - |
4493 | -#include "ucalarm_p.h" |
4494 | -#include "alarmmanager_p_p.h" |
4495 | +#ifndef UCALARM_P_P_H |
4496 | +#define UCALARM_P_P_H |
4497 | + |
4498 | +#include <UbuntuToolkit/private/ucalarm_p.h> |
4499 | + |
4500 | #include <QtCore/QDateTime> |
4501 | #include <QtCore/QPointer> |
4502 | #include <QtQml/QQmlListProperty> |
4503 | |
4504 | +#include <UbuntuToolkit/private/alarmmanager_p_p.h> |
4505 | + |
4506 | UT_NAMESPACE_BEGIN |
4507 | |
4508 | class UBUNTUTOOLKIT_EXPORT UCAlarmPrivate |
4509 | |
4510 | === modified file 'src/UbuntuToolkit/ucalarmmodel.cpp' |
4511 | --- src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp 2016-07-07 07:21:48 +0000 |
4512 | +++ src/UbuntuToolkit/ucalarmmodel.cpp 2016-09-17 11:46:32 +0000 |
4513 | @@ -17,11 +17,13 @@ |
4514 | */ |
4515 | |
4516 | #include "ucalarmmodel_p.h" |
4517 | + |
4518 | +#include <QtQml/QQmlEngine> |
4519 | +#include <QtQml/QQmlInfo> |
4520 | +#include <QtQml/QQmlPropertyMap> |
4521 | + |
4522 | +#include "alarmmanager_p_p.h" |
4523 | #include "ucalarm_p_p.h" |
4524 | -#include "alarmmanager_p_p.h" |
4525 | -#include <QtQml/QQmlPropertyMap> |
4526 | -#include <QtQml/QQmlInfo> |
4527 | -#include <QtQml/QQmlEngine> |
4528 | |
4529 | UT_NAMESPACE_BEGIN |
4530 | |
4531 | |
4532 | === modified file 'src/UbuntuToolkit/ucalarmmodel_p.h' |
4533 | --- src/Ubuntu/UbuntuToolkit/ucalarmmodel_p.h 2016-07-07 07:21:48 +0000 |
4534 | +++ src/UbuntuToolkit/ucalarmmodel_p.h 2016-09-17 11:46:32 +0000 |
4535 | @@ -16,12 +16,13 @@ |
4536 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4537 | */ |
4538 | |
4539 | -#ifndef UCALARMSMODEL_H |
4540 | -#define UCALARMSMODEL_H |
4541 | +#ifndef UCALARMSMODEL_P_H |
4542 | +#define UCALARMSMODEL_P_H |
4543 | |
4544 | #include <QtCore/QAbstractListModel> |
4545 | #include <QtQml/QQmlParserStatus> |
4546 | -#include "ucalarm_p_p.h" |
4547 | + |
4548 | +#include <UbuntuToolkit/private/ucalarm_p_p.h> |
4549 | |
4550 | UT_NAMESPACE_BEGIN |
4551 | |
4552 | @@ -72,4 +73,4 @@ |
4553 | |
4554 | UT_NAMESPACE_END |
4555 | |
4556 | -#endif // UCALARMSMODEL_H |
4557 | +#endif // UCALARMSMODEL_P_H |
4558 | |
4559 | === modified file 'src/UbuntuToolkit/ucapplication.cpp' |
4560 | --- src/Ubuntu/UbuntuToolkit/ucapplication.cpp 2016-07-07 07:21:48 +0000 |
4561 | +++ src/UbuntuToolkit/ucapplication.cpp 2016-09-17 11:46:32 +0000 |
4562 | @@ -19,11 +19,11 @@ |
4563 | #include "ucapplication_p.h" |
4564 | |
4565 | #include <QtCore/QCoreApplication> |
4566 | -#include <QDebug> |
4567 | +#include <QtCore/QDebug> |
4568 | +#include <QtCore/QStandardPaths> |
4569 | +#include <QtGui/QGuiApplication> |
4570 | #include <QtQml/QQmlContext> |
4571 | #include <QtQml/QQmlEngine> |
4572 | -#include <QtCore/QStandardPaths> |
4573 | -#include <QtGui/QGuiApplication> |
4574 | |
4575 | UT_NAMESPACE_BEGIN |
4576 | |
4577 | |
4578 | === modified file 'src/UbuntuToolkit/ucapplication_p.h' |
4579 | --- src/Ubuntu/UbuntuToolkit/ucapplication_p.h 2016-07-07 07:21:48 +0000 |
4580 | +++ src/UbuntuToolkit/ucapplication_p.h 2016-09-17 11:46:32 +0000 |
4581 | @@ -16,11 +16,12 @@ |
4582 | * Author: Christian Dywan <christian.dywan@canonical.om> |
4583 | */ |
4584 | |
4585 | -#ifndef UBUNTU_COMPONENTS_APPLICATION_H |
4586 | -#define UBUNTU_COMPONENTS_APPLICATION_H |
4587 | +#ifndef UCAPPLICATION_P_H |
4588 | +#define UCAPPLICATION_P_H |
4589 | |
4590 | #include <QtCore/QObject> |
4591 | -#include "ubuntutoolkitglobal.h" |
4592 | + |
4593 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4594 | |
4595 | class QQmlContext; |
4596 | class QQmlEngine; |
4597 | @@ -70,4 +71,4 @@ |
4598 | |
4599 | UT_NAMESPACE_END |
4600 | |
4601 | -#endif // UBUNTU_COMPONENTS_I18N_H |
4602 | +#endif // UCAPPLICATION_P_H |
4603 | |
4604 | === modified file 'src/UbuntuToolkit/ucargument_p.h' |
4605 | --- src/Ubuntu/UbuntuToolkit/ucargument_p.h 2016-07-07 07:21:48 +0000 |
4606 | +++ src/UbuntuToolkit/ucargument_p.h 2016-09-17 11:46:32 +0000 |
4607 | @@ -16,13 +16,14 @@ |
4608 | * Author: Florian Boucault <florian.boucault@canonical.com> |
4609 | */ |
4610 | |
4611 | -#ifndef UCARGUMENT_H |
4612 | -#define UCARGUMENT_H |
4613 | +#ifndef UCARGUMENT_P_H |
4614 | +#define UCARGUMENT_P_H |
4615 | |
4616 | #include <QtCore/QObject> |
4617 | #include <QtCore/QStringList> |
4618 | #include <QtCore/QVariant> |
4619 | -#include "ubuntutoolkitglobal.h" |
4620 | + |
4621 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4622 | |
4623 | UT_NAMESPACE_BEGIN |
4624 | |
4625 | @@ -75,4 +76,4 @@ |
4626 | |
4627 | UT_NAMESPACE_END |
4628 | |
4629 | -#endif // UCARGUMENT_H |
4630 | +#endif // UCARGUMENT_P_H |
4631 | |
4632 | === modified file 'src/UbuntuToolkit/ucarguments.cpp' |
4633 | --- src/Ubuntu/UbuntuToolkit/ucarguments.cpp 2016-07-07 07:21:48 +0000 |
4634 | +++ src/UbuntuToolkit/ucarguments.cpp 2016-09-17 11:46:32 +0000 |
4635 | @@ -17,13 +17,15 @@ |
4636 | */ |
4637 | |
4638 | #include "ucarguments_p.h" |
4639 | -#include "i18n_p.h" |
4640 | + |
4641 | #include <QtCore/QCoreApplication> |
4642 | #include <QtCore/QDebug> |
4643 | +#include <QtCore/QFileInfo> |
4644 | #include <QtCore/QTextStream> |
4645 | -#include <QtCore/QFileInfo> |
4646 | +#include <QtQml/QtQml> |
4647 | #include <QtQml/QQmlProperty> |
4648 | -#include <QtQml/qqml.h> |
4649 | + |
4650 | +#include "i18n_p.h" |
4651 | |
4652 | UT_NAMESPACE_BEGIN |
4653 | |
4654 | |
4655 | === modified file 'src/UbuntuToolkit/ucarguments_p.h' |
4656 | --- src/Ubuntu/UbuntuToolkit/ucarguments_p.h 2016-07-07 07:21:48 +0000 |
4657 | +++ src/UbuntuToolkit/ucarguments_p.h 2016-09-17 11:46:32 +0000 |
4658 | @@ -16,17 +16,18 @@ |
4659 | * Author: Florian Boucault <florian.boucault@canonical.com> |
4660 | */ |
4661 | |
4662 | -#ifndef UCARGUMENTS_H |
4663 | -#define UCARGUMENTS_H |
4664 | +#ifndef UCARGUMENTS_P_H |
4665 | +#define UCARGUMENTS_P_H |
4666 | |
4667 | -#include "ucargument_p.h" |
4668 | +#include <QtCore/QHash> |
4669 | +#include <QtCore/QList> |
4670 | #include <QtCore/QObject> |
4671 | -#include <QtCore/QList> |
4672 | #include <QtCore/QStringList> |
4673 | -#include <QtCore/QHash> |
4674 | -#include <QtQml/QQmlPropertyMap> |
4675 | #include <QtQml/QQmlListProperty> |
4676 | #include <QtQml/QQmlParserStatus> |
4677 | +#include <QtQml/QQmlPropertyMap> |
4678 | + |
4679 | +#include <UbuntuToolkit/private/ucargument_p.h> |
4680 | |
4681 | UT_NAMESPACE_BEGIN |
4682 | |
4683 | |
4684 | === modified file 'src/UbuntuToolkit/ucbottomedge.cpp' |
4685 | --- src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp 2016-08-14 09:06:34 +0000 |
4686 | +++ src/UbuntuToolkit/ucbottomedge.cpp 2016-09-17 11:46:32 +0000 |
4687 | @@ -17,24 +17,25 @@ |
4688 | */ |
4689 | |
4690 | #include "ucbottomedge_p_p.h" |
4691 | + |
4692 | +#include <QtCore/QtMath> |
4693 | +#include <QtGui/QGuiApplication> |
4694 | +#include <QtGui/QScreen> |
4695 | +#include <QtGui/QStyleHints> |
4696 | +#include <QtQml/QQmlEngine> |
4697 | +#include <QtQml/QQmlProperty> |
4698 | +#include <QtQuick/private/qquickanimation_p.h> |
4699 | +#include <QtQuick/private/qquickflickable_p.h> |
4700 | +#include <QtQuick/private/qquickitem_p.h> |
4701 | +#include <UbuntuGestures/private/ucswipearea_p_p.h> |
4702 | + |
4703 | #include "ucbottomedgestyle_p.h" |
4704 | #include "ucbottomedgeregion_p_p.h" |
4705 | #include "ucbottomedgehint_p_p.h" |
4706 | #include "ucstyleditembase_p_p.h" |
4707 | -#include <QtCore/QtMath> |
4708 | -#include <QtQml/QQmlEngine> |
4709 | -#include <QtGui/QScreen> |
4710 | -#include <QtQml/QQmlProperty> |
4711 | -#include <QtGui/QGuiApplication> |
4712 | -#include <QtGui/QStyleHints> |
4713 | -#include <QtQuick/private/qquickitem_p.h> |
4714 | -#include <QtQuick/private/qquickflickable_p.h> |
4715 | - |
4716 | #include "ucheader_p.h" |
4717 | #include "ucaction_p.h" |
4718 | #include "quickutils_p.h" |
4719 | -#include "private/ucswipearea_p_p.h" |
4720 | -#include <QtQuick/private/qquickanimation_p.h> |
4721 | |
4722 | Q_LOGGING_CATEGORY(ucBottomEdge, "ubuntu.components.BottomEdge", QtMsgType::QtWarningMsg) |
4723 | |
4724 | |
4725 | === modified file 'src/UbuntuToolkit/ucbottomedge_p.h' |
4726 | --- src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h 2016-07-07 07:21:48 +0000 |
4727 | +++ src/UbuntuToolkit/ucbottomedge_p.h 2016-09-17 11:46:32 +0000 |
4728 | @@ -16,13 +16,14 @@ |
4729 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4730 | */ |
4731 | |
4732 | -#ifndef UCBOTTOMEDGE_H |
4733 | -#define UCBOTTOMEDGE_H |
4734 | +#ifndef UCBOTTOMEDGE_P_H |
4735 | +#define UCBOTTOMEDGE_P_H |
4736 | |
4737 | -#include "ucstyleditembase_p.h" |
4738 | +#include <QtCore/QLoggingCategory> |
4739 | #include <QtCore/QPointer> |
4740 | #include <QtQuick/private/qquickitemchangelistener_p.h> |
4741 | -#include <QtCore/QLoggingCategory> |
4742 | + |
4743 | +#include <UbuntuToolkit/private/ucstyleditembase_p.h> |
4744 | |
4745 | class QQuickAbstractAnimation; |
4746 | |
4747 | @@ -129,4 +130,4 @@ |
4748 | |
4749 | #define LOG qCDebug(ucBottomEdge) << "[BottomEdge]" |
4750 | |
4751 | -#endif // UCBOTTOMEDGE_H |
4752 | +#endif // UCBOTTOMEDGE_P_H |
4753 | |
4754 | === modified file 'src/UbuntuToolkit/ucbottomedge_p_p.h' |
4755 | --- src/Ubuntu/UbuntuToolkit/ucbottomedge_p_p.h 2016-07-07 07:21:48 +0000 |
4756 | +++ src/UbuntuToolkit/ucbottomedge_p_p.h 2016-09-17 11:46:32 +0000 |
4757 | @@ -16,12 +16,13 @@ |
4758 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4759 | */ |
4760 | |
4761 | -#ifndef UCBOTTOMEDGE_P_H |
4762 | -#define UCBOTTOMEDGE_P_H |
4763 | - |
4764 | -#include "ucbottomedge_p.h" |
4765 | -#include "ucstyleditembase_p_p.h" |
4766 | -#include "ucaction_p.h" |
4767 | +#ifndef UCBOTTOMEDGE_P_P_H |
4768 | +#define UCBOTTOMEDGE_P_P_H |
4769 | + |
4770 | +#include <UbuntuToolkit/private/ucbottomedge_p.h> |
4771 | + |
4772 | +#include <UbuntuToolkit/private/ucstyleditembase_p_p.h> |
4773 | +#include <UbuntuToolkit/private/ucaction_p.h> |
4774 | |
4775 | UT_NAMESPACE_BEGIN |
4776 | |
4777 | @@ -116,4 +117,4 @@ |
4778 | |
4779 | UT_NAMESPACE_END |
4780 | |
4781 | -#endif // UCBOTTOMEDGE_P_H |
4782 | +#endif // UCBOTTOMEDGE_P_P_H |
4783 | |
4784 | === modified file 'src/UbuntuToolkit/ucbottomedgehint.cpp' |
4785 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgehint.cpp 2016-07-07 07:21:48 +0000 |
4786 | +++ src/UbuntuToolkit/ucbottomedgehint.cpp 2016-09-17 11:46:32 +0000 |
4787 | @@ -17,14 +17,16 @@ |
4788 | */ |
4789 | |
4790 | #include "ucbottomedgehint_p_p.h" |
4791 | + |
4792 | +#include <QtQml/private/qqmlproperty_p.h> |
4793 | +#include <QtQuick/private/qquickflickable_p.h> |
4794 | +#include <UbuntuGestures/private/ucswipearea_p_p.h> |
4795 | + |
4796 | +#include "propertychange_p.h" |
4797 | +#include "quickutils_p.h" |
4798 | +#include "ucaction_p.h" |
4799 | #include "ucstyleditembase_p_p.h" |
4800 | -#include "quickutils_p.h" |
4801 | #include "ucunits_p.h" |
4802 | -#include "ucaction_p.h" |
4803 | -#include "private/ucswipearea_p_p.h" |
4804 | -#include <propertychange_p.h> |
4805 | -#include <QtQml/private/qqmlproperty_p.h> |
4806 | -#include <QtQuick/private/qquickflickable_p.h> |
4807 | |
4808 | #define SWIPE_AREA_HEIGHT_GU 3 |
4809 | |
4810 | |
4811 | === modified file 'src/UbuntuToolkit/ucbottomedgehint_p.h' |
4812 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h 2016-07-07 07:21:48 +0000 |
4813 | +++ src/UbuntuToolkit/ucbottomedgehint_p.h 2016-09-17 11:46:32 +0000 |
4814 | @@ -16,11 +16,12 @@ |
4815 | * Authors: Zsombor Egri <zsombor.egri@canonical.com> |
4816 | */ |
4817 | |
4818 | -#ifndef UCBOTTOMEDGEHINT_H |
4819 | -#define UCBOTTOMEDGEHINT_H |
4820 | - |
4821 | -#include "ucactionitem_p.h" |
4822 | -#include <ubuntugesturesglobal.h> |
4823 | +#ifndef UCBOTTOMEDGEHINT_P_H |
4824 | +#define UCBOTTOMEDGEHINT_P_H |
4825 | + |
4826 | +#include <UbuntuGestures/ubuntugesturesglobal.h> |
4827 | + |
4828 | +#include <UbuntuToolkit/private/ucactionitem_p.h> |
4829 | |
4830 | class QQuickFlickable; |
4831 | UG_FORWARD_DECLARE_CLASS(UCSwipeArea) |
4832 | @@ -102,4 +103,4 @@ |
4833 | |
4834 | UT_NAMESPACE_END |
4835 | |
4836 | -#endif // UCBOTTOMEDGEHINT_H |
4837 | +#endif // UCBOTTOMEDGEHINT_P_H |
4838 | |
4839 | === modified file 'src/UbuntuToolkit/ucbottomedgehint_p_p.h' |
4840 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p_p.h 2016-07-07 07:21:48 +0000 |
4841 | +++ src/UbuntuToolkit/ucbottomedgehint_p_p.h 2016-09-17 11:46:32 +0000 |
4842 | @@ -16,12 +16,12 @@ |
4843 | * Authors: Zsombor Egri <zsombor.egri@canonical.com> |
4844 | */ |
4845 | |
4846 | -#ifndef UCBOTTOMEDGEHINT_P |
4847 | -#define UCBOTTOMEDGEHINT_P |
4848 | - |
4849 | -#include "ucbottomedgehint_p.h" |
4850 | -#include "ucactionitem_p_p.h" |
4851 | -#include <ubuntugesturesglobal.h> |
4852 | +#ifndef UCBOTTOMEDGEHINT_P_P_H |
4853 | +#define UCBOTTOMEDGEHINT_P_P_H |
4854 | + |
4855 | +#include <UbuntuToolkit/private/ucbottomedgehint_p.h> |
4856 | + |
4857 | +#include <UbuntuToolkit/private/ucactionitem_p_p.h> |
4858 | |
4859 | UG_FORWARD_DECLARE_CLASS(UCSwipeArea) |
4860 | |
4861 | @@ -50,4 +50,4 @@ |
4862 | |
4863 | UT_NAMESPACE_END |
4864 | |
4865 | -#endif // UCBOTTOMEDGEHINT_P |
4866 | +#endif // UCBOTTOMEDGEHINT_P_P_H |
4867 | |
4868 | === modified file 'src/UbuntuToolkit/ucbottomedgeregion.cpp' |
4869 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp 2016-07-19 18:12:33 +0000 |
4870 | +++ src/UbuntuToolkit/ucbottomedgeregion.cpp 2016-09-17 11:46:32 +0000 |
4871 | @@ -16,11 +16,12 @@ |
4872 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4873 | */ |
4874 | |
4875 | -#include "ucbottomedge_p_p.h" |
4876 | #include "ucbottomedgeregion_p_p.h" |
4877 | -#include <propertychange_p.h> |
4878 | + |
4879 | #include <QtQml/private/qqmlproperty_p.h> |
4880 | |
4881 | +#include "propertychange_p.h" |
4882 | +#include "ucbottomedge_p_p.h" |
4883 | |
4884 | UT_NAMESPACE_BEGIN |
4885 | |
4886 | |
4887 | === modified file 'src/UbuntuToolkit/ucbottomedgeregion_p.h' |
4888 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h 2016-07-07 07:21:48 +0000 |
4889 | +++ src/UbuntuToolkit/ucbottomedgeregion_p.h 2016-09-17 11:46:32 +0000 |
4890 | @@ -16,15 +16,16 @@ |
4891 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4892 | */ |
4893 | |
4894 | -#ifndef UCBOTTOMEDGEREGION_H |
4895 | -#define UCBOTTOMEDGEREGION_H |
4896 | +#ifndef UCBOTTOMEDGEREGION_P_H |
4897 | +#define UCBOTTOMEDGEREGION_P_H |
4898 | |
4899 | #include <QtCore/QObject> |
4900 | -#include <QtQml/QQmlParserStatus> |
4901 | +#include <QtCore/QPointer> |
4902 | #include <QtCore/QUrl> |
4903 | -#include <QtCore/QPointer> |
4904 | #include <QtQml/QQmlIncubator> |
4905 | -#include <ubuntutoolkitglobal.h> |
4906 | +#include <QtQml/QQmlParserStatus> |
4907 | + |
4908 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4909 | |
4910 | class QQmlComponent; |
4911 | |
4912 | @@ -85,4 +86,4 @@ |
4913 | |
4914 | UT_NAMESPACE_END |
4915 | |
4916 | -#endif // UCBOTTOMEDGEREGION_H |
4917 | +#endif // UCBOTTOMEDGEREGION_P_H |
4918 | |
4919 | === modified file 'src/UbuntuToolkit/ucbottomedgeregion_p_p.h' |
4920 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p_p.h 2016-07-07 15:33:34 +0000 |
4921 | +++ src/UbuntuToolkit/ucbottomedgeregion_p_p.h 2016-09-17 11:46:32 +0000 |
4922 | @@ -16,12 +16,14 @@ |
4923 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4924 | */ |
4925 | |
4926 | -#ifndef UCBOTTOMEDGEREGION_P |
4927 | -#define UCBOTTOMEDGEREGION_P |
4928 | - |
4929 | -#include "ucbottomedgeregion_p.h" |
4930 | +#ifndef UCBOTTOMEDGEREGION_P_P_H |
4931 | +#define UCBOTTOMEDGEREGION_P_P_H |
4932 | + |
4933 | +#include <UbuntuToolkit/private/ucbottomedgeregion_p.h> |
4934 | + |
4935 | +#include <QtCore/private/qobject_p.h> |
4936 | + |
4937 | #include <UbuntuToolkit/private/asyncloader_p_p.h> |
4938 | -#include <QtCore/private/qobject_p.h> |
4939 | |
4940 | UT_NAMESPACE_BEGIN |
4941 | |
4942 | @@ -82,4 +84,4 @@ |
4943 | |
4944 | UT_NAMESPACE_END |
4945 | |
4946 | -#endif // UCBOTTOMEDGEREGION_P |
4947 | +#endif // UCBOTTOMEDGEREGION_P_P_H |
4948 | |
4949 | === modified file 'src/UbuntuToolkit/ucbottomedgestyle.cpp' |
4950 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp 2016-07-07 07:21:48 +0000 |
4951 | +++ src/UbuntuToolkit/ucbottomedgestyle.cpp 2016-09-17 11:46:32 +0000 |
4952 | @@ -17,6 +17,7 @@ |
4953 | */ |
4954 | |
4955 | #include "ucbottomedgestyle_p.h" |
4956 | + |
4957 | #include "ucbottomedge_p_p.h" |
4958 | |
4959 | UT_NAMESPACE_BEGIN |
4960 | |
4961 | === modified file 'src/UbuntuToolkit/ucbottomedgestyle_p.h' |
4962 | --- src/Ubuntu/UbuntuToolkit/ucbottomedgestyle_p.h 2016-07-07 07:21:48 +0000 |
4963 | +++ src/UbuntuToolkit/ucbottomedgestyle_p.h 2016-09-17 11:46:32 +0000 |
4964 | @@ -16,11 +16,12 @@ |
4965 | * Author: Zsombor Egri <zsombor.egri@canonical.com> |
4966 | */ |
4967 | |
4968 | -#ifndef UCBOTTOMEDGESTYLE_H |
4969 | -#define UCBOTTOMEDGESTYLE_H |
4970 | +#ifndef UCBOTTOMEDGESTYLE_P_H |
4971 | +#define UCBOTTOMEDGESTYLE_P_H |
4972 | |
4973 | #include <QtQuick/QQuickItem> |
4974 | -#include "ubuntutoolkitglobal.h" |
4975 | + |
4976 | +#include <UbuntuToolkit/ubuntutoolkitglobal.h> |
4977 | |
4978 | class QQuickItem; |
4979 | class QQuickAbstractAnimation; |
4980 | @@ -63,4 +64,4 @@ |
4981 | |
4982 | UT_NAMESPACE_END |
4983 | |
4984 | -#endif // UCBOTTOMEDGESTYLE_H |
4985 | +#endif // UCBOTTOMEDGESTYLE_P_H |
4986 | |
4987 | === modified file 'src/UbuntuToolkit/ucdefaulttheme.cpp' |
4988 | --- src/Ubuntu/UbuntuToolkit/ucdefaulttheme.cpp 2016-07-07 07:21:48 +0000 |
4989 | +++ src/UbuntuToolkit/ucdefaulttheme.cpp 2016-09-17 11:46:32 +0000 |
4990 | @@ -18,13 +18,14 @@ |
4991 | */ |
4992 | |
4993 | #include "ucdefaulttheme_p.h" |
4994 | -#include "uctheme_p.h" |
4995 | |
4996 | -#include <QDebug> |
4997 | +#include <QtCore/QDebug> |
4998 | #include <QtCore/QDir> |
4999 | #include <QtCore/QFile> |
5000 | #include <QtCore/QStandardPaths> |
The diff has been truncated for viewing.