From 59c3670b63b6e97dac6115a0819e6c412d3f7888 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 15 Jun 2016 14:04:53 +0200 Subject: Make sure all private headers in Qt Core include qglobal_p.h The rule was: - if the header included qglobal.h, turn that into qglobal_p.h - otherwise, insert the #include after the "We mean it" warning qglobal_p.h currently only includes qglobal.h. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b7 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/corelib/codecs/cp949codetbl_p.h | 2 + src/corelib/codecs/qbig5codec_p.h | 1 + src/corelib/codecs/qeuckrcodec_p.h | 1 + src/corelib/codecs/qgb18030codec_p.h | 1 + src/corelib/codecs/qiconvcodec_p.h | 1 + src/corelib/codecs/qicucodec_p.h | 2 + src/corelib/codecs/qisciicodec_p.h | 1 + src/corelib/codecs/qjpunicode_p.h | 2 +- src/corelib/codecs/qlatincodec_p.h | 1 + src/corelib/codecs/qsimplecodec_p.h | 1 + src/corelib/codecs/qtextcodec_p.h | 1 + src/corelib/codecs/qtsciicodec_p.h | 1 + src/corelib/codecs/qwindowscodec_p.h | 1 + src/corelib/global/qglobal_p.h | 52 ++++++++++++++++++++++ src/corelib/global/qhooks_p.h | 2 +- src/corelib/global/qnumeric_p.h | 2 +- src/corelib/io/qabstractfileengine_p.h | 1 + src/corelib/io/qdatastream_p.h | 1 + src/corelib/io/qdataurl_p.h | 1 + src/corelib/io/qdebug_p.h | 1 + src/corelib/io/qfilesystementry_p.h | 1 + src/corelib/io/qipaddress_p.h | 1 + src/corelib/io/qlockfile_p.h | 1 + src/corelib/io/qloggingregistry_p.h | 1 + src/corelib/io/qstorageinfo_p.h | 1 + src/corelib/io/qtextstream_p.h | 1 + src/corelib/io/qtldurl_p.h | 1 + src/corelib/io/qurl_p.h | 1 + src/corelib/io/qurltlds_p.h | 2 + src/corelib/io/qwindowspipewriter_p.h | 1 + src/corelib/io/qwinoverlappedionotifier_p.h | 1 + src/corelib/json/qjsonparser_p.h | 1 + src/corelib/json/qjsonwriter_p.h | 2 + src/corelib/kernel/qcfsocketnotifier_p.h | 1 + src/corelib/kernel/qcore_mac_p.h | 2 +- src/corelib/kernel/qcore_unix_p.h | 1 + src/corelib/kernel/qcorecmdlineargs_p.h | 1 + src/corelib/kernel/qcoreglobaldata_p.h | 1 + src/corelib/kernel/qcrashhandler_p.h | 2 +- src/corelib/kernel/qeventdispatcher_winrt_p.h | 1 + src/corelib/kernel/qfunctions_p.h | 2 +- src/corelib/kernel/qjni_p.h | 2 +- src/corelib/kernel/qjnihelpers_p.h | 2 +- src/corelib/kernel/qmetaobject_moc_p.h | 2 + src/corelib/kernel/qmetaobjectbuilder_p.h | 1 + src/corelib/kernel/qmetatype_p.h | 1 + src/corelib/kernel/qobject_p.h | 1 + src/corelib/kernel/qppsattribute_p.h | 1 + src/corelib/kernel/qsystemerror_p.h | 1 + src/corelib/kernel/qtimerinfo_unix_p.h | 2 + src/corelib/kernel/qtranslator_p.h | 2 + src/corelib/mimetypes/qmimeglobpattern_p.h | 2 +- src/corelib/mimetypes/qmimemagicrule_p.h | 2 +- src/corelib/mimetypes/qmimetype_p.h | 1 + src/corelib/plugin/qelfparser_p.h | 2 +- src/corelib/plugin/qlibrary_p.h | 1 + src/corelib/plugin/qmachparser_p.h | 2 +- src/corelib/plugin/qsystemlibrary_p.h | 2 +- src/corelib/statemachine/qsignaleventgenerator_p.h | 1 + src/corelib/thread/qfutureinterface_p.h | 1 + src/corelib/thread/qmutex_p.h | 2 +- src/corelib/thread/qmutexpool_p.h | 1 + src/corelib/thread/qorderedmutexlocker_p.h | 1 + src/corelib/thread/qreadwritelock_p.h | 2 +- src/corelib/tools/qbytedata_p.h | 1 + src/corelib/tools/qcollator_p.h | 1 + src/corelib/tools/qdatetime_p.h | 1 + src/corelib/tools/qdatetimeparser_p.h | 1 + src/corelib/tools/qfreelist_p.h | 1 + src/corelib/tools/qharfbuzz_p.h | 2 + src/corelib/tools/qlocale_data_p.h | 2 + src/corelib/tools/qlocale_p.h | 1 + src/corelib/tools/qpodlist_p.h | 1 + src/corelib/tools/qringbuffer_p.h | 1 + src/corelib/tools/qscopedpointer_p.h | 2 + src/corelib/tools/qsimd_p.h | 2 +- src/corelib/tools/qstringiterator_p.h | 1 + src/corelib/tools/qtimezoneprivate_data_p.h | 2 + src/corelib/tools/qtools_p.h | 2 +- src/corelib/tools/qunicodetables_p.h | 2 + src/corelib/tools/qunicodetools_p.h | 1 + src/corelib/xml/qxmlstream_p.h | 2 + src/corelib/xml/qxmlutils_p.h | 1 + 83 files changed, 147 insertions(+), 17 deletions(-) create mode 100644 src/corelib/global/qglobal_p.h (limited to 'src') diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h index 3d55bcfac9..3b615d4e17 100644 --- a/src/corelib/codecs/cp949codetbl_p.h +++ b/src/corelib/codecs/cp949codetbl_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include + static const unsigned short cp949_icode_to_unicode[] = { 0xac02, 0xac03, 0xac05, 0xac06, 0xac0b, 0xac0c, 0xac0d, 0xac0e, 0xac0f, 0xac18, 0xac1e, 0xac1f, 0xac21, 0xac22, 0xac23, 0xac25, 0xac26, 0xac27, 0xac28, 0xac29, 0xac2a, 0xac2b, 0xac2e, 0xac32, 0xac33, 0xac34, 0xac35, 0xac36, 0xac37, 0xac3a, diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h index 24a520a119..9dbcf41a6d 100644 --- a/src/corelib/codecs/qbig5codec_p.h +++ b/src/corelib/codecs/qbig5codec_p.h @@ -55,6 +55,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h index 0311fb689c..2cf950a350 100644 --- a/src/corelib/codecs/qeuckrcodec_p.h +++ b/src/corelib/codecs/qeuckrcodec_p.h @@ -76,6 +76,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h index 3884eea6fd..dd136aeddb 100644 --- a/src/corelib/codecs/qgb18030codec_p.h +++ b/src/corelib/codecs/qgb18030codec_p.h @@ -53,6 +53,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/codecs/qiconvcodec_p.h b/src/corelib/codecs/qiconvcodec_p.h index 4c7f7084e6..dd078fdda4 100644 --- a/src/corelib/codecs/qiconvcodec_p.h +++ b/src/corelib/codecs/qiconvcodec_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "qtextcodec.h" #if defined(Q_OS_UNIX) && !defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) diff --git a/src/corelib/codecs/qicucodec_p.h b/src/corelib/codecs/qicucodec_p.h index a277529dc4..3a373ce5b3 100644 --- a/src/corelib/codecs/qicucodec_p.h +++ b/src/corelib/codecs/qicucodec_p.h @@ -53,6 +53,8 @@ // We mean it. // +#include + extern "C" { typedef struct UConverter UConverter; } diff --git a/src/corelib/codecs/qisciicodec_p.h b/src/corelib/codecs/qisciicodec_p.h index 94a3171d7d..f92c0091ce 100644 --- a/src/corelib/codecs/qisciicodec_p.h +++ b/src/corelib/codecs/qisciicodec_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qtextcodec.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h index 104f540b66..4fa2b9f757 100644 --- a/src/corelib/codecs/qjpunicode_p.h +++ b/src/corelib/codecs/qjpunicode_p.h @@ -80,7 +80,7 @@ // We mean it. // -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qlatincodec_p.h b/src/corelib/codecs/qlatincodec_p.h index b3556a411a..1042c3b80d 100644 --- a/src/corelib/codecs/qlatincodec_p.h +++ b/src/corelib/codecs/qlatincodec_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qtextcodec.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qsimplecodec_p.h b/src/corelib/codecs/qsimplecodec_p.h index d45cf2377f..d268a9f5b8 100644 --- a/src/corelib/codecs/qsimplecodec_p.h +++ b/src/corelib/codecs/qsimplecodec_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qtextcodec.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h index ad05d01b90..f3c2d090c9 100644 --- a/src/corelib/codecs/qtextcodec_p.h +++ b/src/corelib/codecs/qtextcodec_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "qtextcodec.h" #include diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h index 6beb22cf6a..68ab01f7b5 100644 --- a/src/corelib/codecs/qtsciicodec_p.h +++ b/src/corelib/codecs/qtsciicodec_p.h @@ -80,6 +80,7 @@ // We mean it. // +#include #include "QtCore/qtextcodec.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qwindowscodec_p.h b/src/corelib/codecs/qwindowscodec_p.h index 529c621b2e..2fd3c35378 100644 --- a/src/corelib/codecs/qwindowscodec_p.h +++ b/src/corelib/codecs/qwindowscodec_p.h @@ -50,6 +50,7 @@ // We mean it. // +#include #include "qtextcodec.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h new file mode 100644 index 0000000000..e8d822b6c6 --- /dev/null +++ b/src/corelib/global/qglobal_p.h @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 Intel Corporation. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGLOBAL_P_H +#define QGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qglobal.h" +#include "qglobal_p.h" // include self to avoid syncqt warning - no-op + +#endif // QGLOBAL_P_H + diff --git a/src/corelib/global/qhooks_p.h b/src/corelib/global/qhooks_p.h index 47270d8ad2..a51a2ec86b 100644 --- a/src/corelib/global/qhooks_p.h +++ b/src/corelib/global/qhooks_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index b7f7d5187c..7d725f617c 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include "QtCore/qglobal.h" +#include "QtCore/private/qglobal_p.h" #include #include diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 0293184645..48b3dec324 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qfile.h" #include "QtCore/qdir.h" diff --git a/src/corelib/io/qdatastream_p.h b/src/corelib/io/qdatastream_p.h index 73f57e2d6c..3ca0ae840e 100644 --- a/src/corelib/io/qdatastream_p.h +++ b/src/corelib/io/qdatastream_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qdataurl_p.h b/src/corelib/io/qdataurl_p.h index d2fa247b95..fd5c7df50b 100644 --- a/src/corelib/io/qdataurl_p.h +++ b/src/corelib/io/qdataurl_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qurl.h" #include "QtCore/qbytearray.h" #include "QtCore/qstring.h" diff --git a/src/corelib/io/qdebug_p.h b/src/corelib/io/qdebug_p.h index ead86bbb6d..a1887655d2 100644 --- a/src/corelib/io/qdebug_p.h +++ b/src/corelib/io/qdebug_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qdebug.h" #include "QtCore/qmetaobject.h" #include "QtCore/qflags.h" diff --git a/src/corelib/io/qfilesystementry_p.h b/src/corelib/io/qfilesystementry_p.h index 6bb8fc2400..300a375377 100644 --- a/src/corelib/io/qfilesystementry_p.h +++ b/src/corelib/io/qfilesystementry_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/io/qipaddress_p.h b/src/corelib/io/qipaddress_p.h index 52fa9c05ad..5a478ae27b 100644 --- a/src/corelib/io/qipaddress_p.h +++ b/src/corelib/io/qipaddress_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "qstring.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qlockfile_p.h b/src/corelib/io/qlockfile_p.h index d7f2a1d52d..86a606ec00 100644 --- a/src/corelib/io/qlockfile_p.h +++ b/src/corelib/io/qlockfile_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h index b8b62e034f..5197da1ba4 100644 --- a/src/corelib/io/qloggingregistry_p.h +++ b/src/corelib/io/qloggingregistry_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include #include diff --git a/src/corelib/io/qstorageinfo_p.h b/src/corelib/io/qstorageinfo_p.h index 9dc66f2d69..a14fa8480a 100644 --- a/src/corelib/io/qstorageinfo_p.h +++ b/src/corelib/io/qstorageinfo_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "qstorageinfo.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qtextstream_p.h b/src/corelib/io/qtextstream_p.h index 684cff6aa1..a642beddc4 100644 --- a/src/corelib/io/qtextstream_p.h +++ b/src/corelib/io/qtextstream_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "qtextstream.h" #ifndef QT_NO_TEXTCODEC #include "qtextcodec.h" diff --git a/src/corelib/io/qtldurl_p.h b/src/corelib/io/qtldurl_p.h index b1fde0c700..b9fbdebbc5 100644 --- a/src/corelib/io/qtldurl_p.h +++ b/src/corelib/io/qtldurl_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qurl.h" #include "QtCore/qstring.h" diff --git a/src/corelib/io/qurl_p.h b/src/corelib/io/qurl_p.h index 49dcdeb144..cb88cac35e 100644 --- a/src/corelib/io/qurl_p.h +++ b/src/corelib/io/qurl_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "qurl.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qurltlds_p.h b/src/corelib/io/qurltlds_p.h index 69d0701faa..2bd5c68c7b 100644 --- a/src/corelib/io/qurltlds_p.h +++ b/src/corelib/io/qurltlds_p.h @@ -52,6 +52,8 @@ // We mean it. // +#include + QT_BEGIN_NAMESPACE // note to maintainer: diff --git a/src/corelib/io/qwindowspipewriter_p.h b/src/corelib/io/qwindowspipewriter_p.h index 3c641670b6..5a0d04855f 100644 --- a/src/corelib/io/qwindowspipewriter_p.h +++ b/src/corelib/io/qwindowspipewriter_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include #include diff --git a/src/corelib/io/qwinoverlappedionotifier_p.h b/src/corelib/io/qwinoverlappedionotifier_p.h index febdfe310f..276a1d861e 100644 --- a/src/corelib/io/qwinoverlappedionotifier_p.h +++ b/src/corelib/io/qwinoverlappedionotifier_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include typedef struct _OVERLAPPED OVERLAPPED; diff --git a/src/corelib/json/qjsonparser_p.h b/src/corelib/json/qjsonparser_p.h index ceb366b0f8..e3b95109c6 100644 --- a/src/corelib/json/qjsonparser_p.h +++ b/src/corelib/json/qjsonparser_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/json/qjsonwriter_p.h b/src/corelib/json/qjsonwriter_p.h index b9cdbb6976..76a8460449 100644 --- a/src/corelib/json/qjsonwriter_p.h +++ b/src/corelib/json/qjsonwriter_p.h @@ -50,6 +50,8 @@ // // We mean it. // + +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qcfsocketnotifier_p.h b/src/corelib/kernel/qcfsocketnotifier_p.h index c11c345361..12c5bf6334 100644 --- a/src/corelib/kernel/qcfsocketnotifier_p.h +++ b/src/corelib/kernel/qcfsocketnotifier_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index b94aac1093..63e1cb48dc 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -61,7 +61,7 @@ #include #endif -#include "qglobal.h" +#include "private/qglobal_p.h" #ifdef __OBJC__ #include diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 6ed316254b..7ea7e90d94 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "qplatformdefs.h" #include "qatomic.h" #include "qhash.h" diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h index c5d9d130f0..33445a1625 100644 --- a/src/corelib/kernel/qcorecmdlineargs_p.h +++ b/src/corelib/kernel/qcorecmdlineargs_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qstring.h" #include "QtCore/qstringlist.h" diff --git a/src/corelib/kernel/qcoreglobaldata_p.h b/src/corelib/kernel/qcoreglobaldata_p.h index 4f97449c75..32b5becf4f 100644 --- a/src/corelib/kernel/qcoreglobaldata_p.h +++ b/src/corelib/kernel/qcoreglobaldata_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qmap.h" #include "QtCore/qstringlist.h" #include "QtCore/qreadwritelock.h" diff --git a/src/corelib/kernel/qcrashhandler_p.h b/src/corelib/kernel/qcrashhandler_p.h index 1fd0ff3af8..64c15ce66c 100644 --- a/src/corelib/kernel/qcrashhandler_p.h +++ b/src/corelib/kernel/qcrashhandler_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #ifndef QT_NO_CRASHHANDLER diff --git a/src/corelib/kernel/qeventdispatcher_winrt_p.h b/src/corelib/kernel/qeventdispatcher_winrt_p.h index abcb3bf99c..f69bb9cf3f 100644 --- a/src/corelib/kernel/qeventdispatcher_winrt_p.h +++ b/src/corelib/kernel/qeventdispatcher_winrt_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "QtCore/qabstracteventdispatcher.h" #include diff --git a/src/corelib/kernel/qfunctions_p.h b/src/corelib/kernel/qfunctions_p.h index ff035fcb11..715c553dc5 100644 --- a/src/corelib/kernel/qfunctions_p.h +++ b/src/corelib/kernel/qfunctions_p.h @@ -51,7 +51,7 @@ #ifndef QFUNCTIONS_P_H #define QFUNCTIONS_P_H -#include +#include #if defined(Q_OS_VXWORKS) # include "QtCore/qfunctions_vxworks.h" diff --git a/src/corelib/kernel/qjni_p.h b/src/corelib/kernel/qjni_p.h index 79cbe1de72..52abd51dc1 100644 --- a/src/corelib/kernel/qjni_p.h +++ b/src/corelib/kernel/qjni_p.h @@ -52,7 +52,7 @@ #define QJNI_P_H #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qjnihelpers_p.h b/src/corelib/kernel/qjnihelpers_p.h index 78ad08a09e..d57228b856 100644 --- a/src/corelib/kernel/qjnihelpers_p.h +++ b/src/corelib/kernel/qjnihelpers_p.h @@ -52,7 +52,7 @@ // #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qmetaobject_moc_p.h b/src/corelib/kernel/qmetaobject_moc_p.h index 1b24837ec0..ad258acfcd 100644 --- a/src/corelib/kernel/qmetaobject_moc_p.h +++ b/src/corelib/kernel/qmetaobject_moc_p.h @@ -52,6 +52,8 @@ // We mean it. // +#include + QT_BEGIN_NAMESPACE // This function is shared with moc.cpp. This file should be included where needed. diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h index 0934873ad0..144595330d 100644 --- a/src/corelib/kernel/qmetaobjectbuilder_p.h +++ b/src/corelib/kernel/qmetaobjectbuilder_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include #include diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 445e912cf7..dd0bce2645 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "qmetatype.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 4383ece245..a7d7ef0889 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "QtCore/qobject.h" #include "QtCore/qpointer.h" #include "QtCore/qsharedpointer.h" diff --git a/src/corelib/kernel/qppsattribute_p.h b/src/corelib/kernel/qppsattribute_p.h index 1d9cc4484c..035756e002 100644 --- a/src/corelib/kernel/qppsattribute_p.h +++ b/src/corelib/kernel/qppsattribute_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include #include diff --git a/src/corelib/kernel/qsystemerror_p.h b/src/corelib/kernel/qsystemerror_p.h index c3d8118711..440b763149 100644 --- a/src/corelib/kernel/qsystemerror_p.h +++ b/src/corelib/kernel/qsystemerror_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qtimerinfo_unix_p.h b/src/corelib/kernel/qtimerinfo_unix_p.h index 2de8a4681f..7bd6f16ea1 100644 --- a/src/corelib/kernel/qtimerinfo_unix_p.h +++ b/src/corelib/kernel/qtimerinfo_unix_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include + // #define QTIMERINFO_DEBUG #include "qabstracteventdispatcher.h" diff --git a/src/corelib/kernel/qtranslator_p.h b/src/corelib/kernel/qtranslator_p.h index 21de8e2a8c..e148637ac6 100644 --- a/src/corelib/kernel/qtranslator_p.h +++ b/src/corelib/kernel/qtranslator_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include + enum { Q_EQ = 0x01, Q_LT = 0x02, diff --git a/src/corelib/mimetypes/qmimeglobpattern_p.h b/src/corelib/mimetypes/qmimeglobpattern_p.h index e4c74ff7fa..3e4fdb50f6 100644 --- a/src/corelib/mimetypes/qmimeglobpattern_p.h +++ b/src/corelib/mimetypes/qmimeglobpattern_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #ifndef QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h index 26f93d96cc..0c6c1dbcd7 100644 --- a/src/corelib/mimetypes/qmimemagicrule_p.h +++ b/src/corelib/mimetypes/qmimemagicrule_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #ifndef QT_NO_MIMETYPE diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index c89ffbefa3..b0bfad2f65 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "qmimetype.h" #ifndef QT_NO_MIMETYPE diff --git a/src/corelib/plugin/qelfparser_p.h b/src/corelib/plugin/qelfparser_p.h index 145f00df43..bcda19e8b5 100644 --- a/src/corelib/plugin/qelfparser_p.h +++ b/src/corelib/plugin/qelfparser_p.h @@ -52,7 +52,7 @@ // #include -#include +#include #ifndef QT_NO_LIBRARY #if defined (Q_OF_ELF) && defined(Q_CC_GNU) diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h index c3bdc5a832..f883e74843 100644 --- a/src/corelib/plugin/qlibrary_p.h +++ b/src/corelib/plugin/qlibrary_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "QtCore/qlibrary.h" #include "QtCore/qpointer.h" #include "QtCore/qstringlist.h" diff --git a/src/corelib/plugin/qmachparser_p.h b/src/corelib/plugin/qmachparser_p.h index 0df7a98f96..ff7eaadb70 100644 --- a/src/corelib/plugin/qmachparser_p.h +++ b/src/corelib/plugin/qmachparser_p.h @@ -52,7 +52,7 @@ // #include -#include +#include #ifndef QT_NO_LIBRARY #if defined(Q_OF_MACH_O) diff --git a/src/corelib/plugin/qsystemlibrary_p.h b/src/corelib/plugin/qsystemlibrary_p.h index 7b6d180df9..4e093c0b7c 100644 --- a/src/corelib/plugin/qsystemlibrary_p.h +++ b/src/corelib/plugin/qsystemlibrary_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #ifdef Q_OS_WIN # include # include diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h index c0bb52c480..92b1ee3b70 100644 --- a/src/corelib/statemachine/qsignaleventgenerator_p.h +++ b/src/corelib/statemachine/qsignaleventgenerator_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h index f5f0e7047f..ee8dfe1354 100644 --- a/src/corelib/thread/qfutureinterface_p.h +++ b/src/corelib/thread/qfutureinterface_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include #include diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h index 20cc5f1f5e..4e6f522a37 100644 --- a/src/corelib/thread/qmutex_p.h +++ b/src/corelib/thread/qmutex_p.h @@ -54,7 +54,7 @@ // We mean it. // -#include +#include #include #include #include diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/thread/qmutexpool_p.h index 796e65d960..b6c837e9f9 100644 --- a/src/corelib/thread/qmutexpool_p.h +++ b/src/corelib/thread/qmutexpool_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "QtCore/qatomic.h" #include "QtCore/qmutex.h" #include "QtCore/qvarlengtharray.h" diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h index f54f7c705d..81c7c5268c 100644 --- a/src/corelib/thread/qorderedmutexlocker_p.h +++ b/src/corelib/thread/qorderedmutexlocker_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/thread/qreadwritelock_p.h b/src/corelib/thread/qreadwritelock_p.h index 24d25eb2be..bb58dfab56 100644 --- a/src/corelib/thread/qreadwritelock_p.h +++ b/src/corelib/thread/qreadwritelock_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include +#include #include #include diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/tools/qbytedata_p.h index b275158597..8331be112d 100644 --- a/src/corelib/tools/qbytedata_p.h +++ b/src/corelib/tools/qbytedata_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index a056fcc4af..fbbce00676 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "qcollator.h" #include #ifdef QT_USE_ICU diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h index c4d00c99f9..38a084b257 100644 --- a/src/corelib/tools/qdatetime_p.h +++ b/src/corelib/tools/qdatetime_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "qplatformdefs.h" #include "QtCore/qatomic.h" #include "QtCore/qdatetime.h" diff --git a/src/corelib/tools/qdatetimeparser_p.h b/src/corelib/tools/qdatetimeparser_p.h index 01a2f20802..6f381965a9 100644 --- a/src/corelib/tools/qdatetimeparser_p.h +++ b/src/corelib/tools/qdatetimeparser_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include "qplatformdefs.h" #include "QtCore/qatomic.h" #include "QtCore/qdatetime.h" diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h index ebe34bc135..c3efc41d62 100644 --- a/src/corelib/tools/qfreelist_p.h +++ b/src/corelib/tools/qfreelist_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qharfbuzz_p.h b/src/corelib/tools/qharfbuzz_p.h index cc4d9bbd85..2a0307d35f 100644 --- a/src/corelib/tools/qharfbuzz_p.h +++ b/src/corelib/tools/qharfbuzz_p.h @@ -48,6 +48,8 @@ // We mean it. // +#include + #ifndef QHARFBUZZ_P_H #define QHARFBUZZ_P_H diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index 262cecb564..869153942e 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include + QT_BEGIN_NAMESPACE /* This part of the file isn't generated, but written by hand since diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index f95edf4d14..c83c9d3333 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include "QtCore/qstring.h" #include "QtCore/qvarlengtharray.h" #include "QtCore/qvariant.h" diff --git a/src/corelib/tools/qpodlist_p.h b/src/corelib/tools/qpodlist_p.h index 810df02000..95990e0bb6 100644 --- a/src/corelib/tools/qpodlist_p.h +++ b/src/corelib/tools/qpodlist_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h index 9ff1ec49cf..44716cf4d3 100644 --- a/src/corelib/tools/qringbuffer_p.h +++ b/src/corelib/tools/qringbuffer_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include #include diff --git a/src/corelib/tools/qscopedpointer_p.h b/src/corelib/tools/qscopedpointer_p.h index f74a3a7945..c1c44e7695 100644 --- a/src/corelib/tools/qscopedpointer_p.h +++ b/src/corelib/tools/qscopedpointer_p.h @@ -48,6 +48,8 @@ // We mean it. // +#include + #ifndef QSCOPEDPOINTER_P_H #define QSCOPEDPOINTER_P_H diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 259da3cfec..9d8695c0f6 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -52,7 +52,7 @@ // We mean it. // -#include +#include #include /* diff --git a/src/corelib/tools/qstringiterator_p.h b/src/corelib/tools/qstringiterator_p.h index 2e24031ce4..7cf59ae42f 100644 --- a/src/corelib/tools/qstringiterator_p.h +++ b/src/corelib/tools/qstringiterator_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h index b4e52af33a..6bbcb0e2cd 100644 --- a/src/corelib/tools/qtimezoneprivate_data_p.h +++ b/src/corelib/tools/qtimezoneprivate_data_p.h @@ -52,6 +52,8 @@ // We mean it. // +#include + QT_BEGIN_NAMESPACE /* diff --git a/src/corelib/tools/qtools_p.h b/src/corelib/tools/qtools_p.h index 09adee5586..17d2ab852a 100644 --- a/src/corelib/tools/qtools_p.h +++ b/src/corelib/tools/qtools_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "QtCore/qglobal.h" +#include "QtCore/private/qglobal_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index cec84a2490..5a422ea4eb 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -50,6 +50,8 @@ // We mean it. // +#include + #ifndef QUNICODETABLES_P_H #define QUNICODETABLES_P_H diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/tools/qunicodetools_p.h index 5cde188656..5e2d56a226 100644 --- a/src/corelib/tools/qunicodetools_p.h +++ b/src/corelib/tools/qunicodetools_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h index ab0bbba413..c68d6f0f53 100644 --- a/src/corelib/xml/qxmlstream_p.h +++ b/src/corelib/xml/qxmlstream_p.h @@ -48,6 +48,8 @@ // We mean it. // +#include + // This file was generated by qlalr - DO NOT EDIT! #ifndef QXMLSTREAM_P_H #define QXMLSTREAM_P_H diff --git a/src/corelib/xml/qxmlutils_p.h b/src/corelib/xml/qxmlutils_p.h index d45ecb50b3..d8d25e0efe 100644 --- a/src/corelib/xml/qxmlutils_p.h +++ b/src/corelib/xml/qxmlutils_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include #include QT_BEGIN_NAMESPACE -- cgit v1.2.3