AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize #include order and form in qdatetime.cpp

Browse Source 
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>
This commit is contained in:
Edward Welbourne 2020-09-23 14:21:30 +02:00
parent 1c591fd924
commit 47cb350d8f
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/corelib/time/qdatetime.cpp
View File

@ -39,39 +39,35 @@
****************************************************************************/
#include "qplatformdefs.h"
#include "qdatetime.h"
#include "qcalendar.h"
#include "qdatastream.h"
#include "qdebug.h"
#include "qset.h"
#include "qlocale.h"
#include "private/qdatetime_p.h"
#if QT_CONFIG(datetimeparser)
#include "private/qdatetimeparser_p.h"
#endif
#include "qdatastream.h"
#include "qset.h"
#include "qlocale.h"
#include "qdatetime.h"
#if QT_CONFIG(timezone)
#include "qtimezoneprivate_p.h"
#ifdef Q_OS_DARWIN
#include "private/qcore_mac_p.h"
#endif
#include "qdebug.h"
#ifndef Q_OS_WIN
#include <locale.h>
#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
/*****************************************************************************