diff options
author | Aaron Franke <arnfranke@yahoo.com> | 2022-10-20 16:54:39 -0500 |
---|---|---|
committer | Aaron Franke <arnfranke@yahoo.com> | 2022-12-26 15:16:25 -0600 |
commit | 8d7d1b0bb29c5603ffd02d1c82247c59d6b90917 (patch) | |
tree | cfcf4632cbbb80aa4a62865d4df4eb0b0400b567 /core/os/time.h | |
parent | b6e06038f8a373f7fb8d26e92d5f06887e459598 (diff) | |
download | redot-engine-8d7d1b0bb29c5603ffd02d1c82247c59d6b90917.tar.gz |
Remove duplicate Month and Weekday enums
Well, they were duplicately-exposed, but triplicately-defined.
Diffstat (limited to 'core/os/time.h')
-rw-r--r-- | core/os/time.h | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/core/os/time.h b/core/os/time.h index 4b4ce3526a..379a224f34 100644 --- a/core/os/time.h +++ b/core/os/time.h @@ -32,6 +32,7 @@ #define TIME_H #include "core/object/class_db.h" +#include "time_enums.h" // This Time class conforms with as many of the ISO 8601 standards as possible. // * As per ISO 8601:2004 4.3.2.1, all dates follow the Proleptic Gregorian @@ -51,33 +52,6 @@ class Time : public Object { public: static Time *get_singleton(); - enum Month { - /// Start at 1 to follow Windows SYSTEMTIME structure - /// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724950(v=vs.85).aspx - MONTH_JANUARY = 1, - MONTH_FEBRUARY, - MONTH_MARCH, - MONTH_APRIL, - MONTH_MAY, - MONTH_JUNE, - MONTH_JULY, - MONTH_AUGUST, - MONTH_SEPTEMBER, - MONTH_OCTOBER, - MONTH_NOVEMBER, - MONTH_DECEMBER, - }; - - enum Weekday : uint8_t { - WEEKDAY_SUNDAY, - WEEKDAY_MONDAY, - WEEKDAY_TUESDAY, - WEEKDAY_WEDNESDAY, - WEEKDAY_THURSDAY, - WEEKDAY_FRIDAY, - WEEKDAY_SATURDAY, - }; - // Methods that convert times. Dictionary get_datetime_dict_from_unix_time(int64_t p_unix_time_val) const; Dictionary get_date_dict_from_unix_time(int64_t p_unix_time_val) const; |