M module-apps/application-desktop/CMakeLists.txt => module-apps/application-desktop/CMakeLists.txt +1 -0
@@ 57,4 57,5 @@ target_link_libraries(${PROJECT_NAME}
service-cellular
service-db
service-desktop
+ service-time
)
M module-apps/application-desktop/windows/DesktopMainWindow.cpp => module-apps/application-desktop/windows/DesktopMainWindow.cpp +4 -4
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include <memory>
@@ 14,9 14,9 @@
#include "application-desktop/widgets/NotificationsBox.hpp"
#include "application-messages/ApplicationMessages.hpp"
#include "gui/widgets/Image.hpp"
-#include "service-appmgr/Controller.hpp"
-#include "service-time/ServiceTime.hpp"
-#include "service-time/messages/TimeMessage.hpp"
+#include <service-appmgr/Controller.hpp>
+#include <service-time/ServiceTime.hpp>
+#include <service-time/TimeMessage.hpp>
#include <UiCommonActions.hpp>
#include "i18/i18.hpp"
M module-services/service-time/CMakeLists.txt => module-services/service-time/CMakeLists.txt +14 -20
@@ 1,27 1,21 @@
-include_directories( ${CMAKE_PROJECT_NAME}
+project(service-time)
+message( "${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}" )
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
+set(SOURCES
+ ServiceTime.cpp
+ timeEvents/TimeEvents.cpp
+ timeEvents/CalendarTimeEvents.cpp
)
-include_directories( ${PROJECT_NAME}
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}"
+target_include_directories(${PROJECT_NAME}
+ PUBLIC
+ "${CMAKE_CURRENT_LIST_DIR}"
)
-message( "${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" )
-
-target_sources( ${PROJECT_NAME}
-
- PRIVATE
- "${CMAKE_CURRENT_LIST_DIR}/ServiceTime.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/timeEvents/TimeEvents.cpp"
- "${CMAKE_CURRENT_LIST_DIR}/timeEvents/CalendarTimeEvents.cpp"
-
- PUBLIC
- "${CMAKE_CURRENT_LIST_DIR}/ServiceTime.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/timeEvents/TimeEvents.hpp"
- "${CMAKE_CURRENT_LIST_DIR}/timeEvents/CalendarTimeEvents.hpp"
+target_link_libraries(${PROJECT_NAME}
+ PRIVATE
+ module-sys
+ module-apps
)
-
M module-services/service-time/ServiceTime.cpp => module-services/service-time/ServiceTime.cpp +14 -14
@@ 2,20 2,20 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ServiceTime.hpp"
-
-#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp> // for SelectFirstUpcomingResult
-#include <vector> // for vector
-#include <memory> // for make_shared, shared_ptr, operator!=, __shared_ptr_access, unique_ptr
-#include <utility> // for move
-
-#include "messages/TimeMessage.hpp" // for TimeResponseMessage
-#include <service-db/DBNotificationMessage.hpp> // for NotificationMessage
-#include <service-db/QueryMessage.hpp> // for QueryResponse
-#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::Events
-#include "Common/Query.hpp" // for QueryResult
-#include "MessageType.hpp" // for MessageType, MessageType::DBServiceNotification, MessageType::ReloadTimers, MessageType::TimersProcessingStart, MessageType::TimersProcessingStop
-#include "log/log.hpp" // for LOG_INFO, LOG_FATAL
-#include "service-time/timeEvents/CalendarTimeEvents.hpp" // for CalendarTimeEvents
+#include "service-time/CalendarTimeEvents.hpp"
+#include "service-time/TimeMessage.hpp"
+
+#include <BaseInterface.hpp>
+#include <Common/Query.hpp>
+#include <MessageType.hpp>
+#include <log/log.hpp>
+#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp>
+#include <service-db/DBNotificationMessage.hpp>
+#include <service-db/QueryMessage.hpp>
+
+#include <memory>
+#include <utility>
+#include <vector>
namespace stm
{
M module-services/service-time/ServiceTime.hpp => module-services/service-time/ServiceTime.hpp +11 -10
@@ 1,21 1,22 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <module-db/queries/calendar/QueryEventsGet.hpp>
+
+#include "service-time/CalendarTimeEvents.hpp"
+#include "service-time/ServiceTime.hpp"
+
+#include <MessageType.hpp>
+#include <Service/Common.hpp>
+#include <Service/Message.hpp>
+#include <Service/Service.hpp>
#include <module-db/queries/calendar/QueryEventsEdit.hpp>
+#include <module-db/queries/calendar/QueryEventsGet.hpp>
#include <module-sys/Service/Timer.hpp>
+
#include <functional>
#include <string> // for allocator, string
-#include "Service/Service.hpp" // for Service
-#include "ServiceTime.hpp"
-#include "MessageType.hpp"
-#include "timeEvents/CalendarTimeEvents.hpp" // for CalendarTimeEvents
-#include "Service/Common.hpp" // for ReturnCodes, ServicePowerMode
-#include "Service/Message.hpp" // for MessagePointer, DataMessage (ptr only), ResponseMessage (ptr only)
-#include "service-time/ServiceTime.hpp"
-
namespace service::name
{
inline constexpr auto service_time = "ServiceTime";
R module-services/service-time/timeEvents/CalendarTimeEvents.hpp => module-services/service-time/service-time/CalendarTimeEvents.hpp +8 -7
@@ 1,15 1,16 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
+#include "TimeEvents.hpp"
+
+#include <application-calendar/data/dateCommon.hpp>
+#include <module-db/Interface/EventsRecord.hpp>
#include <module-db/queries/calendar/QueryEventsEdit.hpp>
-#include <stdint.h> // for uint32_t
-#include <memory> // for allocator, unique_ptr
-#include <string> // for string
-#include "TimeEvents.hpp" // for TimeEvents
-#include "EventsRecord.hpp" // for EventsRecord
-#include "application-calendar/data/dateCommon.hpp" // for TIME_POINT_INVALID, TimePoint
+#include <cstdint>
+#include <memory>
+#include <string>
namespace db
{
R module-services/service-time/timeEvents/TimeEvents.hpp => module-services/service-time/service-time/TimeEvents.hpp +7 -6
@@ 1,14 1,15 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
+
+#include <Service/Service.hpp>
#include <module-db/queries/calendar/QueryEventsEdit.hpp>
-#include <module-sys/Service/Timer.hpp> // for Timer
-#include <stdint.h> // for uint32_t
-#include <memory> // for unique_ptr
-#include <string> // for string
+#include <module-sys/Service/Timer.hpp>
-#include "Service/Service.hpp"
+#include <cstdint>
+#include <memory>
+#include <string>
namespace db
{
R module-services/service-time/messages/TimeMessage.hpp => module-services/service-time/service-time/TimeMessage.hpp +3 -3
@@ 1,10 1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include "Service/Message.hpp"
-#include "MessageType.hpp"
+#include <MessageType.hpp>
+#include <Service/Message.hpp>
class TimeMessage : public sys::DataMessage
{
M module-services/service-time/timeEvents/CalendarTimeEvents.cpp => module-services/service-time/timeEvents/CalendarTimeEvents.cpp +18 -18
@@ 1,26 1,26 @@
// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "CalendarTimeEvents.hpp"
+#include <service-time/CalendarTimeEvents.hpp>
+#include <service-time/TimeEvents.hpp>
-#include <service-appmgr/Controller.hpp> // for Controller
-#include <service-db/DBServiceAPI.hpp> // for DBServiceAPI
-#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp> // for SelectFirstUpcoming, SelectFirstUpcomingResult
-#include <module-gui/gui/SwitchData.hpp> // for SwitchData
-#include <module-apps/application-calendar/data/CalendarData.hpp> // for EventRecordData
-#include <module-apps/application-calendar/ApplicationCalendar.hpp> // for name_calendar
-#include <module-apps/application-calendar/data/dateCommon.hpp> // for TimePointNow, TimePoint, TIME_POINT_INVALID
-#include <algorithm> // for min
-#include <chrono> // for duration, milliseconds, operator-, operator<, time_point, duration_cast, operator!=, minutes, operator""ms
-#include <type_traits> // for __success_type<>::type
-#include <utility> // for move
-#include <vector> // for vector
+#include <BaseInterface.hpp>
+#include <Common/Query.hpp>
+#include <application-calendar/widgets/CalendarStyle.hpp>
+#include <module-apps/application-calendar/ApplicationCalendar.hpp>
+#include <module-apps/application-calendar/data/CalendarData.hpp>
+#include <module-apps/application-calendar/data/dateCommon.hpp>
+#include <module-db/queries/calendar/QueryEventsSelectFirstUpcoming.hpp>
+#include <module-gui/gui/SwitchData.hpp>
+#include <queries/calendar/QueryEventsEdit.hpp>
+#include <service-appmgr/Controller.hpp>
+#include <service-db/DBServiceAPI.hpp>
-#include "BaseInterface.hpp" // for Interface, Interface::Name, Interface::Name::Events
-#include "Common/Query.hpp" // for Query, QueryResult
-#include "application-calendar/widgets/CalendarStyle.hpp" // for event_reminder_window
-#include "queries/calendar/QueryEventsEdit.hpp" // for Edit
-#include "service-time/timeEvents/TimeEvents.hpp" // for TimeEvents
+#include <algorithm>
+#include <chrono>
+#include <type_traits>
+#include <utility>
+#include <vector>
namespace sys
{
M module-services/service-time/timeEvents/TimeEvents.cpp => module-services/service-time/timeEvents/TimeEvents.cpp +5 -5
@@ 1,12 1,12 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-#include "TimeEvents.hpp"
+#include <service-time/TimeEvents.hpp>
-#include <utility> // for move
+#include <Common/Query.hpp>
+#include <Service/Timer.hpp>
-#include "Common/Query.hpp" // for QueryResult
-#include "Service/Timer.hpp" // for Timer, Timer::Type, Timer::Type::SingleShot
+#include <utility>
namespace sys
{