M module-apps/application-alarm-clock/widgets/AlarmItem.cpp => module-apps/application-alarm-clock/widgets/AlarmItem.cpp +1 -1
@@ 4,8 4,8 @@
#include "AlarmItem.hpp"
#include "AlarmClockStyle.hpp"
#include "application-alarm-clock/data/AlarmsData.hpp"
-#include "application-calendar/data/dateCommon.hpp"
#include <InputEvent.hpp>
+#include <time/dateCommon.hpp>
#include <time/time_conversion.hpp>
namespace gui
M module-apps/application-calendar/CMakeLists.txt => module-apps/application-calendar/CMakeLists.txt +0 -1
@@ 36,7 36,6 @@ target_sources(application-calendar
PUBLIC
include/application-calendar/ApplicationCalendar.hpp
include/application-calendar/data/CalendarData.hpp
- include/application-calendar/data/dateCommon.hpp
include/application-calendar/data/OptionParser.hpp
)
M module-apps/application-calendar/data/CalendarData.cpp => module-apps/application-calendar/data/CalendarData.cpp +1 -1
@@ 2,7 2,7 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include <application-calendar/data/CalendarData.hpp>
-#include <application-calendar/data/dateCommon.hpp>
+#include <time/dateCommon.hpp>
WeekDaysRepeatData::WeekDaysRepeatData()
{
M module-apps/application-calendar/include/application-calendar/data/CalendarData.hpp => module-apps/application-calendar/include/application-calendar/data/CalendarData.hpp +1 -1
@@ 3,10 3,10 @@
#pragma once
-#include "dateCommon.hpp"
#include <application-calendar/widgets/CalendarStyle.hpp>
#include <module-gui/gui/SwitchData.hpp>
+#include <time/dateCommon.hpp>
enum class EventAction
{
M module-apps/application-calendar/models/MonthModel.hpp => module-apps/application-calendar/models/MonthModel.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <application-calendar/data/dateCommon.hpp>
+#include <time/dateCommon.hpp>
#include <string>
#include <vector>
M module-apps/apps-common/widgets/DateWidget.cpp => module-apps/apps-common/widgets/DateWidget.cpp +1 -1
@@ 8,7 8,7 @@
#include <time/time_conversion.hpp>
#include <time/time_date_validation.hpp>
#include <module-gui/gui/input/InputEvent.hpp>
-#include <application-calendar/data/dateCommon.hpp>
+#include <time/dateCommon.hpp>
namespace date_and_time = style::window::date_and_time;
M module-db/Interface/AlarmsRecord.hpp => module-db/Interface/AlarmsRecord.hpp +1 -1
@@ 6,7 6,7 @@
#include "Record.hpp"
#include "module-db/Databases/AlarmsDB.hpp"
#include "module-db/Common/Common.hpp"
-#include <application-calendar/data/dateCommon.hpp>
+#include <time/dateCommon.hpp>
#include <utf8/UTF8.hpp>
#include <stdint.h>
M module-db/Tables/AlarmsTable.hpp => module-db/Tables/AlarmsTable.hpp +1 -1
@@ 7,7 7,7 @@
#include "Database/Database.hpp"
#include "Record.hpp"
#include "Table.hpp"
-#include <application-calendar/data/dateCommon.hpp>
+#include <time/dateCommon.hpp>
#include <utf8/UTF8.hpp>
struct AlarmsRecord;
M module-services/service-alarm/include/service-alarm/AlarmMessage.hpp => module-services/service-alarm/include/service-alarm/AlarmMessage.hpp +2 -1
@@ 3,12 3,13 @@
#pragma once
-#include <application-calendar/data/dateCommon.hpp>
#include <module-db/Interface/AlarmEventRecord.hpp>
#include <module-db/Interface/EventRecord.hpp>
#include <MessageType.hpp>
#include <Service/Message.hpp>
+#include <time/dateCommon.hpp>
+
#include <vector>
namespace alarms
M module-utils/ical/ParserICS.hpp => module-utils/ical/ParserICS.hpp +4 -1
@@ 2,8 2,11 @@
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#pragma once
-#include <application-calendar/data/dateCommon.hpp>
+
+#include <time/dateCommon.hpp>
+
#include <json11.hpp>
+
#include <memory>
/**
M module-utils/time/CMakeLists.txt => module-utils/time/CMakeLists.txt +2 -0
@@ 18,6 18,8 @@ target_sources(time
time/TimeRangeParser.cpp
time/TimeZone.cpp
time/time_conversion_factory.cpp
+
+ time/dateCommon.hpp
)
target_include_directories(time PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
M module-utils/time/test/unittest_TimeRangeParser.cpp => module-utils/time/test/unittest_TimeRangeParser.cpp +3 -2
@@ 3,8 3,9 @@
#define CATCH_CONFIG_MAIN
#include <catch2/catch.hpp>
-#include "time/TimeRangeParser.hpp"
-#include <application-calendar/data/dateCommon.hpp>
+
+#include <time/TimeRangeParser.hpp>
+#include <time/dateCommon.hpp>
#include <cstdint>
#include <cstring>
M module-utils/time/time/FromTillDate.hpp => module-utils/time/time/FromTillDate.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
-#include <application-calendar/data/dateCommon.hpp>
+#include "dateCommon.hpp"
namespace utils
{
M module-utils/time/time/TimeRangeParser.hpp => module-utils/time/time/TimeRangeParser.hpp +1 -1
@@ 3,7 3,7 @@
#pragma once
#include "Utils.hpp"
-#include <application-calendar/data/dateCommon.hpp>
+#include "dateCommon.hpp"
namespace utils::time
{
R module-apps/application-calendar/include/application-calendar/data/dateCommon.hpp => module-utils/time/time/dateCommon.hpp +0 -0