diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-23 14:21:30 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-30 16:28:23 +0200 |
| commit | 47cb350d8febf7837b0a7b3cf0eca0036b75a0cb (patch) | |
| tree | 5913f11dc10579791309d4b912a5bf90a192a7e3 /src | |
| parent | 1c591fd9246ca776304a3c370dd2578bd886feac (diff) | |
Standardize #include order and form in qdatetime.cpp
There were duplicates; there was neither rhyme nor reason to the order.
One was conditioned on a deprecated old define.
Change-Id: Iba390f4a83758418379fb5fc522f08ada3e41d12
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index ea8fc53a08..62df269785 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -39,39 +39,35 @@ ****************************************************************************/ #include "qplatformdefs.h" -#include "private/qdatetime_p.h" -#if QT_CONFIG(datetimeparser) -#include "private/qdatetimeparser_p.h" -#endif +#include "qdatetime.h" +#include "qcalendar.h" #include "qdatastream.h" +#include "qdebug.h" #include "qset.h" #include "qlocale.h" -#include "qdatetime.h" -#if QT_CONFIG(timezone) -#include "qtimezoneprivate_p.h" + +#include "private/qdatetime_p.h" +#if QT_CONFIG(datetimeparser) +#include "private/qdatetimeparser_p.h" #endif -#include "qdebug.h" -#ifndef Q_OS_WIN -#include <locale.h> +#ifdef Q_OS_DARWIN +#include "private/qcore_mac_p.h" +#endif +#include "private/qgregoriancalendar_p.h" +#if QT_CONFIG(timezone) +#include "private/qtimezoneprivate_p.h" #endif #include <cmath> -#ifdef Q_CC_MINGW -# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r() -#endif -#include <time.h> #ifdef Q_OS_WIN # include <qt_windows.h> #endif - -#if defined(Q_OS_MAC) -#include <private/qcore_mac_p.h> +#include <time.h> +#ifdef Q_CC_MINGW +# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r() #endif -#include "qcalendar.h" -#include "qgregoriancalendar_p.h" - QT_BEGIN_NAMESPACE /***************************************************************************** |