From 28088a3d740421dd06b7b20321566ae84ba1b18f Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 12 Nov 2021 11:24:26 +0100 Subject: [PATCH] Remove some unused constants from qtimezoneprivate_win.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recent commit 6845c444d082cfac561b3c8f28f53480ae066746 elicits warnings about two unused constants. Remove an unused macro at the same time, and add missing LL suffix to remaining qint64 constants. Change-Id: I4c84e10b512030e0e4f860d434382e62e6c936f5 Reviewed-by: Mårten Nordheim --- src/corelib/time/qtimezoneprivate_win.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/corelib/time/qtimezoneprivate_win.cpp b/src/corelib/time/qtimezoneprivate_win.cpp index 577c88187e..61f5b30783 100644 --- a/src/corelib/time/qtimezoneprivate_win.cpp +++ b/src/corelib/time/qtimezoneprivate_win.cpp @@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE */ #define MAX_KEY_LENGTH 255 -#define FILETIME_UNIX_EPOCH Q_UINT64_C(116444736000000000) // MSDN home page for Time support // http://msdn.microsoft.com/en-us/library/windows/desktop/ms724962%28v=vs.85%29.aspx @@ -71,11 +70,9 @@ QT_BEGIN_NAMESPACE static const wchar_t tzRegPath[] = LR"(SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones)"; static const wchar_t currTzRegPath[] = LR"(SYSTEM\CurrentControlSet\Control\TimeZoneInformation)"; -constexpr qint64 MIN_YEAR = -292275056; -constexpr qint64 MAX_YEAR = 292278994; -constexpr qint64 MSECS_PER_DAY = 86400000; -constexpr qint64 TIME_T_MAX = 2145916799; // int maximum 2037-12-31T23:59:59 UTC -constexpr qint64 JULIAN_DAY_FOR_EPOCH = 2440588; // result of julianDayFromDate(1970, 1, 1) +constexpr qint64 MIN_YEAR = -292275056LL; +constexpr qint64 MSECS_PER_DAY = 86400000LL; +constexpr qint64 JULIAN_DAY_FOR_EPOCH = 2440588LL; // result of julianDayFromDate(1970, 1, 1) // Copied from MSDN, see above for link typedef struct _REG_TZI_FORMAT