summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2022-06-22 10:33:05 -0700
committerThiago Macieira <thiago.macieira@intel.com>2022-06-27 17:39:35 -0700
commit159a52bf3e8226d7cddfba486f5782e781fc317f (patch)
tree4902437552d948d6b43ba20f9f0ad87948c11fe8
parent5e67e7efaa2669252fd8c55392b7bc35b72c6079 (diff)
QDateTime: remove a few hardcoded values in favor of <chrono> constants
Change-Id: I6d3880c7d99d4fc494c8fffd16fb01b9d9480c67 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-rw-r--r--src/corelib/time/qdatetime_p.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/time/qdatetime_p.h b/src/corelib/time/qdatetime_p.h
index 5ac65bc1a5..de4de85d8c 100644
--- a/src/corelib/time/qdatetime_p.h
+++ b/src/corelib/time/qdatetime_p.h
@@ -26,6 +26,8 @@
#include "qtimezone.h"
#endif
+#include <chrono>
+
QT_BEGIN_NAMESPACE
class QDateTimePrivate : public QSharedData
@@ -113,13 +115,14 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDateTimePrivate::StatusFlags)
namespace QtPrivate {
namespace DateTimeConstants {
-constexpr qint64 MINS_PER_HOUR = 60;
+using namespace std::chrono;
+constexpr qint64 SECS_PER_MIN = minutes::period::num;
+constexpr qint64 SECS_PER_HOUR = hours::period::num;
+constexpr qint64 SECS_PER_DAY = SECS_PER_HOUR * 24; // std::chrono::days is C++20
-constexpr qint64 SECS_PER_MIN = 60;
-constexpr qint64 SECS_PER_HOUR = SECS_PER_MIN * MINS_PER_HOUR;
-constexpr qint64 SECS_PER_DAY = SECS_PER_HOUR * 24;
+constexpr qint64 MINS_PER_HOUR = std::ratio_divide<hours::period, minutes::period>::num;
-constexpr qint64 MSECS_PER_SEC = 1000;
+constexpr qint64 MSECS_PER_SEC = milliseconds::period::den;
constexpr qint64 MSECS_PER_MIN = SECS_PER_MIN * MSECS_PER_SEC;
constexpr qint64 MSECS_PER_HOUR = SECS_PER_HOUR * MSECS_PER_SEC;
constexpr qint64 MSECS_PER_DAY = SECS_PER_DAY * MSECS_PER_SEC;