summaryrefslogtreecommitdiff
path: root/xfa/fgas/localization/fgas_datetime.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-03-20 15:04:16 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-03-20 20:21:31 +0000
commitcf2d0ca3d5ba890dca4e2735915739430a43cfa0 (patch)
tree3045ca50e2305ea348eb743576e04bdf8ce144f1 /xfa/fgas/localization/fgas_datetime.h
parent2a6482c19c5577924f73d100431acceb8c874e04 (diff)
downloadpdfium-cf2d0ca3d5ba890dca4e2735915739430a43cfa0.tar.xz
Simplify date time code
This CL removes the CFX_DateTime class and moves the one used method into the CFX_Unitime class. Change-Id: I89f6d099b2c436d8f12b9dc2c5f10ac236ad56ef Reviewed-on: https://pdfium-review.googlesource.com/3104 Reviewed-by: Nicolás Peña <npm@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/localization/fgas_datetime.h')
-rw-r--r--xfa/fgas/localization/fgas_datetime.h130
1 files changed, 66 insertions, 64 deletions
diff --git a/xfa/fgas/localization/fgas_datetime.h b/xfa/fgas/localization/fgas_datetime.h
index 1f9f19d2c1..9225dccaaa 100644
--- a/xfa/fgas/localization/fgas_datetime.h
+++ b/xfa/fgas/localization/fgas_datetime.h
@@ -17,35 +17,79 @@ uint8_t FX_DaysInMonth(int32_t iYear, uint8_t iMonth);
class CFX_Unitime {
public:
- CFX_Unitime() { m_iUnitime = 0; }
- explicit CFX_Unitime(int64_t iUnitime) { m_iUnitime = iUnitime; }
-
- int64_t ToInt64() const { return m_iUnitime; }
+ CFX_Unitime()
+ : year_(0),
+ month_(0),
+ day_(0),
+ hour_(0),
+ minute_(0),
+ second_(0),
+ millisecond_(0) {}
+ CFX_Unitime(int32_t year,
+ uint8_t month,
+ uint8_t day,
+ uint8_t hour,
+ uint8_t minute,
+ uint8_t second,
+ uint16_t millisecond)
+ : year_(year),
+ month_(month),
+ day_(day),
+ hour_(hour),
+ minute_(minute),
+ second_(second),
+ millisecond_(millisecond) {}
void Now();
- void Set(int32_t year,
- uint8_t month,
- uint8_t day,
- uint8_t hour,
- uint8_t minute,
- uint8_t second,
- uint16_t millisecond);
- void Set(int64_t t) { m_iUnitime = t; }
- int32_t GetYear() const;
- uint8_t GetMonth() const;
- uint8_t GetDay() const;
- uint8_t GetHour() const;
- uint8_t GetMinute() const;
- uint8_t GetSecond() const;
- uint16_t GetMillisecond() const;
+ void Reset() {
+ year_ = 0;
+ month_ = 0;
+ day_ = 0;
+ hour_ = 0;
+ minute_ = 0;
+ second_ = 0;
+ millisecond_ = 0;
+ }
+
+ bool IsSet() const {
+ return year_ != 0 || month_ != 0 || day_ != 0 || hour_ != 0 ||
+ minute_ != 0 || second_ != 0 || millisecond_ != 0;
+ }
+
+ void SetDate(int32_t year, uint8_t month, uint8_t day) {
+ year_ = year;
+ month_ = month;
+ day_ = day;
+ }
- CFX_Unitime operator+(const CFX_Unitime& t2) const {
- return CFX_Unitime(m_iUnitime + t2.m_iUnitime);
+ void SetTime(uint8_t hour,
+ uint8_t minute,
+ uint8_t second,
+ uint16_t millisecond) {
+ hour_ = hour;
+ minute_ = minute;
+ second_ = second;
+ millisecond_ = millisecond;
}
+ int32_t GetYear() const { return year_; }
+ uint8_t GetMonth() const { return month_; }
+ uint8_t GetDay() const { return day_; }
+ uint8_t GetHour() const { return hour_; }
+ uint8_t GetMinute() const { return minute_; }
+ uint8_t GetSecond() const { return second_; }
+ uint16_t GetMillisecond() const { return millisecond_; }
+ int32_t GetDayOfWeek() const;
+
private:
- int64_t m_iUnitime;
+ int32_t year_;
+ uint8_t month_;
+ uint8_t day_;
+ uint8_t hour_;
+ uint8_t minute_;
+ uint8_t second_;
+ uint16_t millisecond_;
};
#if _FX_OS_ != _FX_ANDROID_
@@ -59,46 +103,4 @@ struct FX_TIMEZONE {
#pragma pack(pop)
#endif
-class CFX_DateTime {
- public:
- CFX_DateTime() {}
- ~CFX_DateTime() {}
-
- bool Set(int32_t year, uint8_t month, uint8_t day);
- int32_t GetDayOfWeek() const;
-
- private:
-#if _FX_OS_ != _FX_ANDROID_
-#pragma pack(push, 1)
-#endif
- struct FX_DATE {
- int32_t year;
- uint8_t month;
- uint8_t day;
- };
-
- struct FX_TIME {
- uint8_t hour;
- uint8_t minute;
- uint8_t second;
- uint16_t millisecond;
- };
-
- struct FX_DATETIME {
- union {
- FX_DATE sDate;
- FX_DATE aDate;
- } Date;
- union {
- FX_TIME sTime;
- FX_TIME aTime;
- } Time;
- };
-
-#if _FX_OS_ != _FX_ANDROID_
-#pragma pack(pop)
-#endif
- FX_DATETIME m_DateTime;
-};
-
#endif // XFA_FGAS_LOCALIZATION_FGAS_DATETIME_H_