← Back to branch summary

~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

« back to all changes in this revision

Viewing changes to src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp

Committer: Tarmac
Author(s): Loïc Molinari
Date: 2016-09-12 16:04:18 UTC
mfrom: (2090.1.7 uitk-test)
Revision ID: tarmac-20160912160418-3murc3kypk2jwamk

Fixed, cleaned up and standardised header inclusions.

Apart from the clean up and the readability improvements, this fixes a bunch of broken private header inclusions (#include "foo_p.h" in private headers instead of "private/foo_p.h" or better <Project/private/foo_p.h>), now all the private headers of the UITK can be included by the users withour compilation issues. It also removes a bunch of direct includes from sources and a few INCLUDEPATHs hacks.

See the CODING file for more details.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

files added:
CODING

files renamed:
src/UbuntuToolkit/privates/splitviewhandler_p_p.h => src/UbuntuToolkit/privates/splitviewhandler_p.h

files modified:
src/UbuntuGestures/UbuntuGestures.pro

src/UbuntuGestures/candidateinactivitytimer.cpp

src/UbuntuGestures/candidateinactivitytimer_p.h

src/UbuntuGestures/damper.cpp

src/UbuntuGestures/damper_p.h

src/UbuntuGestures/debughelpers.cpp

src/UbuntuGestures/debughelpers_p.h

src/UbuntuGestures/pool_p.h

src/UbuntuGestures/timer.cpp

src/UbuntuGestures/timer_p.h

src/UbuntuGestures/timesource.cpp

src/UbuntuGestures/timesource_p.h

src/UbuntuGestures/touchownershipevent.cpp

src/UbuntuGestures/touchownershipevent_p.h

src/UbuntuGestures/touchregistry.cpp

src/UbuntuGestures/touchregistry_p.h

src/UbuntuGestures/ubuntugesturesmodule.cpp

src/UbuntuGestures/ubuntugesturesmodule.h

src/UbuntuGestures/ucswipearea.cpp

src/UbuntuGestures/ucswipearea_p.h

src/UbuntuGestures/ucswipearea_p_p.h

src/UbuntuGestures/unownedtouchevent.cpp

src/UbuntuGestures/unownedtouchevent_p.h

src/UbuntuMetrics/applicationmonitor.cpp

src/UbuntuMetrics/applicationmonitor.h

src/UbuntuMetrics/applicationmonitor_p.h

src/UbuntuMetrics/bitmaptext.cpp

src/UbuntuMetrics/bitmaptext_p.h

src/UbuntuMetrics/events.cpp

src/UbuntuMetrics/events_p.h

src/UbuntuMetrics/gputimer.cpp

src/UbuntuMetrics/gputimer_p.h

src/UbuntuMetrics/logger.cpp

src/UbuntuMetrics/logger.h

src/UbuntuMetrics/logger_p.h

src/UbuntuMetrics/overlay.cpp

src/UbuntuMetrics/overlay_p.h

src/UbuntuMetrics/ubuntumetricsglobal.h

src/UbuntuMetrics/ubuntumetricsglobal_p.h

src/UbuntuToolkit/UbuntuToolkit.pro

src/UbuntuToolkit/actionlist.cpp

src/UbuntuToolkit/actionlist_p.h

src/UbuntuToolkit/adapters/actionsproxy_p.cpp

src/UbuntuToolkit/adapters/actionsproxy_p.h

src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp

src/UbuntuToolkit/adapters/alarmsadapter_p.h

src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp

src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h

src/UbuntuToolkit/alarmmanager_p.cpp

src/UbuntuToolkit/alarmmanager_p.h

src/UbuntuToolkit/alarmmanager_p_p.h

src/UbuntuToolkit/asyncloader_p.h

src/UbuntuToolkit/asyncloader_p_p.h

src/UbuntuToolkit/colorutils.cpp

src/UbuntuToolkit/colorutils_p.h

src/UbuntuToolkit/exclusivegroup.cpp

src/UbuntuToolkit/exclusivegroup_p.h

src/UbuntuToolkit/filterbehavior_p.h

src/UbuntuToolkit/i18n.cpp

src/UbuntuToolkit/i18n_p.h

src/UbuntuToolkit/inversemouseareatype.cpp

src/UbuntuToolkit/inversemouseareatype_p.h

src/UbuntuToolkit/label_p.h

src/UbuntuToolkit/listener.cpp

src/UbuntuToolkit/listener_p.h

src/UbuntuToolkit/livetimer_p.cpp

src/UbuntuToolkit/livetimer_p.h

src/UbuntuToolkit/livetimer_p_p.h

src/UbuntuToolkit/menu.cpp

src/UbuntuToolkit/menu_p.h

src/UbuntuToolkit/menu_p_p.h

src/UbuntuToolkit/menubar.cpp

src/UbuntuToolkit/menubar_p.h

src/UbuntuToolkit/menubar_p_p.h

src/UbuntuToolkit/menugroup.cpp

src/UbuntuToolkit/menugroup_p.h

src/UbuntuToolkit/mousetouchadaptor.cpp

src/UbuntuToolkit/mousetouchadaptor_p.h

src/UbuntuToolkit/mousetouchadaptor_p_p.h

src/UbuntuToolkit/mousetouchadaptor_x11.cpp

src/UbuntuToolkit/privates/appheaderbase.cpp

src/UbuntuToolkit/privates/appheaderbase_p.h

src/UbuntuToolkit/privates/frame.cpp

src/UbuntuToolkit/privates/frame_p.h

src/UbuntuToolkit/privates/listitemdragarea.cpp

src/UbuntuToolkit/privates/listitemdragarea_p.h

src/UbuntuToolkit/privates/listitemdraghandler.cpp

src/UbuntuToolkit/privates/listitemdraghandler_p.h

src/UbuntuToolkit/privates/listitemselection.cpp

src/UbuntuToolkit/privates/listitemselection_p.h

src/UbuntuToolkit/privates/listviewextensions.cpp

src/UbuntuToolkit/privates/listviewextensions_p.h

src/UbuntuToolkit/privates/splitviewhandler.cpp

src/UbuntuToolkit/privates/threelabelsslot_p.cpp

src/UbuntuToolkit/privates/threelabelsslot_p.h

src/UbuntuToolkit/privates/ucpagewrapper.cpp

src/UbuntuToolkit/privates/ucpagewrapper_p.h

src/UbuntuToolkit/privates/ucpagewrapper_p_p.h

src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp

src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h

src/UbuntuToolkit/privates/ucscrollbarutils.cpp

src/UbuntuToolkit/privates/ucscrollbarutils_p.h

src/UbuntuToolkit/propertychange_p.h

src/UbuntuToolkit/qquickclipboard.cpp

src/UbuntuToolkit/qquickclipboard_p.h

src/UbuntuToolkit/qquickclipboard_p_p.h

src/UbuntuToolkit/qquickmimedata.cpp

src/UbuntuToolkit/qquickmimedata_p.h

src/UbuntuToolkit/quickutils.cpp

src/UbuntuToolkit/quickutils_p.h

src/UbuntuToolkit/sortbehavior_p.h

src/UbuntuToolkit/sortfiltermodel_p.h

src/UbuntuToolkit/splitview.cpp

src/UbuntuToolkit/splitview_p.h

src/UbuntuToolkit/splitview_p_p.h

src/UbuntuToolkit/splitviewlayout.cpp

src/UbuntuToolkit/statesaverbackend_p.cpp

src/UbuntuToolkit/statesaverbackend_p.h

src/UbuntuToolkit/timeutils_p.h

src/UbuntuToolkit/tree.cpp

src/UbuntuToolkit/tree_p.h

src/UbuntuToolkit/ubuntutoolkitglobal.h

src/UbuntuToolkit/ubuntutoolkitmodule.cpp

src/UbuntuToolkit/ubuntutoolkitmodule.h

src/UbuntuToolkit/ucabstractbutton.cpp

src/UbuntuToolkit/ucabstractbutton_p.h

src/UbuntuToolkit/ucabstractbutton_p_p.h

src/UbuntuToolkit/ucaction.cpp

src/UbuntuToolkit/ucaction_p.h

src/UbuntuToolkit/ucactioncontext.cpp

src/UbuntuToolkit/ucactioncontext_p.h

src/UbuntuToolkit/ucactionitem.cpp

src/UbuntuToolkit/ucactionitem_p.h

src/UbuntuToolkit/ucactionitem_p_p.h

src/UbuntuToolkit/ucactionmanager.cpp

src/UbuntuToolkit/ucactionmanager_p.h

src/UbuntuToolkit/ucalarm.cpp

src/UbuntuToolkit/ucalarm_p.h

src/UbuntuToolkit/ucalarm_p_p.h

src/UbuntuToolkit/ucalarmmodel.cpp

src/UbuntuToolkit/ucalarmmodel_p.h

src/UbuntuToolkit/ucapplication.cpp

src/UbuntuToolkit/ucapplication_p.h

src/UbuntuToolkit/ucargument_p.h

src/UbuntuToolkit/ucarguments.cpp

src/UbuntuToolkit/ucarguments_p.h

src/UbuntuToolkit/ucbottomedge.cpp

src/UbuntuToolkit/ucbottomedge_p.h

src/UbuntuToolkit/ucbottomedge_p_p.h

src/UbuntuToolkit/ucbottomedgehint.cpp

src/UbuntuToolkit/ucbottomedgehint_p.h

src/UbuntuToolkit/ucbottomedgehint_p_p.h

src/UbuntuToolkit/ucbottomedgeregion.cpp

src/UbuntuToolkit/ucbottomedgeregion_p.h

src/UbuntuToolkit/ucbottomedgeregion_p_p.h

src/UbuntuToolkit/ucbottomedgestyle.cpp

src/UbuntuToolkit/ucbottomedgestyle_p.h

src/UbuntuToolkit/ucdefaulttheme.cpp

src/UbuntuToolkit/ucdefaulttheme_p.h

src/UbuntuToolkit/ucdeprecatedtheme.cpp

src/UbuntuToolkit/ucdeprecatedtheme_p.h

src/UbuntuToolkit/ucfontutils.cpp

src/UbuntuToolkit/ucfontutils_p.h

src/UbuntuToolkit/uchaptics.cpp

src/UbuntuToolkit/uchaptics_p.h

src/UbuntuToolkit/ucheader.cpp

src/UbuntuToolkit/ucheader_p.h

src/UbuntuToolkit/ucimportversionchecker_p.cpp

src/UbuntuToolkit/ucimportversionchecker_p.h

src/UbuntuToolkit/ucinversemouse_p.h

src/UbuntuToolkit/uclabel.cpp

src/UbuntuToolkit/uclabel_p.h

src/UbuntuToolkit/uclistitem.cpp

src/UbuntuToolkit/uclistitem_p.h

src/UbuntuToolkit/uclistitem_p_p.h

src/UbuntuToolkit/uclistitemactions.cpp

src/UbuntuToolkit/uclistitemactions_p.h

src/UbuntuToolkit/uclistitemactions_p_p.h

src/UbuntuToolkit/uclistitemlayout.cpp

src/UbuntuToolkit/uclistitemlayout_p.h

src/UbuntuToolkit/uclistitemstyle.cpp

src/UbuntuToolkit/uclistitemstyle_p.h

src/UbuntuToolkit/ucmainviewbase.cpp

src/UbuntuToolkit/ucmainviewbase_p.h

src/UbuntuToolkit/ucmainviewbase_p_p.h

src/UbuntuToolkit/ucmargins_p.h

src/UbuntuToolkit/ucmathutils.cpp

src/UbuntuToolkit/ucmathutils_p.h

src/UbuntuToolkit/ucmouse_p.h

src/UbuntuToolkit/ucmousefilters.cpp

src/UbuntuToolkit/ucpagetreenode.cpp

src/UbuntuToolkit/ucpagetreenode_p.h

src/UbuntuToolkit/ucpagetreenode_p_p.h

src/UbuntuToolkit/ucperformancemonitor.cpp

src/UbuntuToolkit/ucperformancemonitor_p.h

src/UbuntuToolkit/ucproportionalshape_p.h

src/UbuntuToolkit/ucqquickimageextension.cpp

src/UbuntuToolkit/ucqquickimageextension_p.h

src/UbuntuToolkit/ucscalingimageprovider_p.h

src/UbuntuToolkit/ucserviceproperties.cpp

src/UbuntuToolkit/ucserviceproperties_p.h

src/UbuntuToolkit/ucserviceproperties_p_p.h

src/UbuntuToolkit/ucslotslayout.cpp

src/UbuntuToolkit/ucslotslayout_p.h

src/UbuntuToolkit/ucslotslayout_p_p.h

src/UbuntuToolkit/ucstatesaver.cpp

src/UbuntuToolkit/ucstatesaver_p.h

src/UbuntuToolkit/ucstatesaver_p_p.h

src/UbuntuToolkit/ucstyleditembase.cpp

src/UbuntuToolkit/ucstyleditembase_p.h

src/UbuntuToolkit/ucstyleditembase_p_p.h

src/UbuntuToolkit/ucstylehints.cpp

src/UbuntuToolkit/ucstylehints_p.h

src/UbuntuToolkit/uctheme.cpp

src/UbuntuToolkit/uctheme_p.h

src/UbuntuToolkit/ucthemingextension.cpp

src/UbuntuToolkit/ucthemingextension_p.h

src/UbuntuToolkit/ucubuntuanimation.cpp

src/UbuntuToolkit/ucubuntuanimation_p.h

src/UbuntuToolkit/ucubuntushape.cpp

src/UbuntuToolkit/ucubuntushape_p.h

src/UbuntuToolkit/ucubuntushapeoverlay_p.h

src/UbuntuToolkit/ucunits.cpp

src/UbuntuToolkit/ucunits_p.h

src/UbuntuToolkit/ucurihandler.cpp

src/UbuntuToolkit/ucurihandler_p.h

src/UbuntuToolkit/ucviewitemsattached.cpp

src/UbuntuToolkit/unitythemeiconprovider.cpp

src/UbuntuToolkit/unitythemeiconprovider_p.h

src/UbuntuToolkit/unixsignalhandler_p.cpp

src/UbuntuToolkit/unixsignalhandler_p.h

src/imports/Components/plugin/plugin.cpp

src/imports/Components/plugin/plugin.h

src/imports/Components/plugin/plugin.pri

src/imports/Components/plugin/ucnamespace.h

src/imports/Layouts/plugin/plugin.pri

src/imports/Layouts/plugin/propertychanges.cpp

src/imports/Layouts/plugin/propertychanges_p.h

src/imports/Layouts/plugin/ulconditionallayout.cpp

src/imports/Layouts/plugin/ulconditionallayout.h

src/imports/Layouts/plugin/ullayouts.cpp

src/imports/Layouts/plugin/ullayouts.h

src/imports/Layouts/plugin/ullayouts_p.h

src/imports/Layouts/plugin/ullayoutsattached.cpp

src/imports/Layouts/plugin/ulplugin.cpp

src/imports/Layouts/plugin/ulplugin.h

src/imports/PerformanceMetrics/plugin/rendertimer.cpp

src/imports/PerformanceMetrics/plugin/upmcpuusage.cpp

src/imports/PerformanceMetrics/plugin/upmcpuusage.h

src/imports/PerformanceMetrics/plugin/upmgraphmodel.cpp

src/imports/PerformanceMetrics/plugin/upmplugin.cpp

src/imports/PerformanceMetrics/plugin/upmplugin.h

src/imports/PerformanceMetrics/plugin/upmrenderingtimes.cpp

src/imports/PerformanceMetrics/plugin/upmrenderingtimes.h

src/imports/PerformanceMetrics/plugin/upmtexturefromimage.cpp

src/imports/Test/plugin/plugin.pri

src/imports/Test/plugin/testplugin.cpp

src/imports/Test/plugin/testplugin.h

src/imports/Test/plugin/uctestcase.cpp

src/imports/Test/plugin/uctestcase.h

src/imports/Test/plugin/uctestextras.cpp

src/imports/Test/plugin/uctestextras.h

tests/api/Extinct/Animals/plugin/pangaea.h

tests/api/Extinct/Animals/plugin/plugin.cpp

tests/api/Extinct/Animals/plugin/plugin.h

tests/api/Extinct/Animals/plugin/plugin.pri

tests/api/Extinct/Animals/plugin/rune.cpp

tests/api/Extinct/Animals/plugin/rune.h

tests/api/Extinct/Animals/plugin/smilodon.h

tests/api/Extinct/Animals/plugin/tarpan.h

tests/unit/alarms/tst_alarms.cpp

tests/unit/animator/tst_animator.cpp

tests/unit/argument/tst_argument.cpp

tests/unit/arguments/tst_arguments.cpp

tests/unit/asyncloader/tst_asyncloader.cpp

tests/unit/bottomedge/tst_bottomedge.cpp

tests/unit/components/tst_components.cpp

tests/unit/components_benchmark/tst_components_benchmark.cpp

tests/unit/custom_qpa/main.cpp

tests/unit/custom_qpa/qcustombackingstore.cpp

tests/unit/custom_qpa/qcustombackingstore.h

tests/unit/custom_qpa/qcustomintegration.cpp

tests/unit/custom_qpa/qcustomintegration.h

tests/unit/deprecated_theme_engine/tst_deprecated_theme_engine.cpp

tests/unit/i18n/LocalizedApp/src/tst_i18n_LocalizedApp.cpp

tests/unit/i18n/RelativeTime/src/tst_i18n_RelativeTime.cpp

tests/unit/iconprovider/tst_iconprovider.cpp

tests/unit/inversemousearea/tst_inversemouseareatest.cpp

tests/unit/layouts/tst_layouts.cpp

tests/unit/mainview/tst_mainview.cpp

tests/unit/mousefilters/tst_mousefilterstest.cpp

tests/unit/orientation/tst_orientation.cpp

tests/unit/page/tst_page.cpp

tests/unit/performance/tst_performance.cpp

tests/unit/qmltemplate/tst_qmltemplate.cpp

tests/unit/qquick_image_extension/tst_qquick_image_extension.cpp

tests/unit/quickutils/tst_quickutils.cpp

tests/unit/recreateview/tst_recreateview.cpp

tests/unit/serviceproperties/tst_serviceproperties.cpp

tests/unit/statesaver/tst_statesaver.cpp

tests/unit/subtheming/tst_subtheming.cpp

tests/unit/swipearea/GestureTest.cpp

tests/unit/swipearea/GestureTest.h

tests/unit/swipearea/tst_swipearea.cpp

tests/unit/test-include.pri

tests/unit/test/tst_test.cpp

tests/unit/testparser/main.cpp

tests/unit/theme/tst_theme.cpp

tests/unit/touchregistry/touchregistry.pro

tests/unit/touchregistry/tst_TouchRegistry.cpp

tests/unit/tree/tst_tree.cpp

tests/unit/ubuntu_shape/tst_ubuntu_shape.cpp

tests/unit/units/scale/tst_units_scale.cpp

tests/unit/visual/tabsmodel.cpp

tests/unit/visual/tabsmodel.h

tests/unit/visual/tst_visual.cpp

Show diffs side-by-side

added added

removed removed

src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp

16

16

* Author: Zsombor Egri <zsombor.egri@canonical.com>

17

17

*/

18

18

19

#include "ucalarm_p.h"

20

#include "ucalarm_p_p.h"

21

#include "alarmmanager_p_p.h"

22

#include "alarmsadapter_p.h"

23

#include <qorganizertodooccurrence.h>

19

#include "adapters/alarmsadapter_p.h"

24

20

25

21

#include <QtCore/QFile>

26

22

#include <QtCore/QDir>

30

26

#include <QtCore/QJsonObject>

31

27

#include <QtCore/QJsonArray>

32

28

#include <QtCore/QDebug>

29

#include <QtOrganizer/QtOrganizer>

30

31

#include "alarmmanager_p_p.h"

32

#include "ucalarm_p_p.h"

33

33

34

34

#define ALARM_DATABASE "%1/alarms.json"

35

35

/*

Older »