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 <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Thiago Macieira 2016-06-15 14:04:53 +02:00 committed by Lars Knoll
parent 72adb7f00c
commit 59c3670b63
83 changed files with 147 additions and 17 deletions

View File

@ -51,6 +51,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
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,

View File

@ -55,6 +55,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qtextcodec.h>
#include <QtCore/qlist.h>

View File

@ -76,6 +76,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qtextcodec.h>
#include <QtCore/qlist.h>

View File

@ -53,6 +53,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qtextcodec.h>
#include <QtCore/qlist.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qtextcodec.h"
#if defined(Q_OS_UNIX) && !defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)

View File

@ -53,6 +53,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
extern "C" {
typedef struct UConverter UConverter;
}

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qtextcodec.h"
QT_BEGIN_NAMESPACE

View File

@ -80,7 +80,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qtextcodec.h"
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qtextcodec.h"
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qtextcodec.h"
#include <string.h>

View File

@ -80,6 +80,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qtextcodec.h"
QT_BEGIN_NAMESPACE

View File

@ -50,6 +50,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qtextcodec.h"
QT_BEGIN_NAMESPACE

View File

@ -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

View File

@ -52,7 +52,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE

View File

@ -52,7 +52,7 @@
// We mean it.
//
#include "QtCore/qglobal.h"
#include "QtCore/private/qglobal_p.h"
#include <cmath>
#include <limits>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qfile.h"
#include "QtCore/qdir.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <qdatastream.h>
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qurl.h"
#include "QtCore/qbytearray.h"
#include "QtCore/qstring.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qdebug.h"
#include "QtCore/qmetaobject.h"
#include "QtCore/qflags.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qstring.h>
#include <QtCore/qbytearray.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qstring.h"
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qlockfile.h>
#include <QtCore/qfile.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qloggingcategory.h>
#include <QtCore/qmap.h>
#include <QtCore/qmutex.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qstorageinfo.h"
QT_BEGIN_NAMESPACE

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qtextstream.h"
#ifndef QT_NO_TEXTCODEC
#include "qtextcodec.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qurl.h"
#include "QtCore/qstring.h"

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qurl.h"
QT_BEGIN_NAMESPACE

View File

@ -52,6 +52,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
// note to maintainer:

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <qelapsedtimer.h>
#include <qobject.h>
#include <qbytearray.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <qobject.h>
typedef struct _OVERLAPPED OVERLAPPED;

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <qjsondocument.h>
#include <qvarlengtharray.h>

View File

@ -50,6 +50,8 @@
//
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <qjsonvalue.h>
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qabstracteventdispatcher.h>
#include <QtCore/qhash.h>

View File

@ -61,7 +61,7 @@
#include <CoreFoundation/CoreFoundation.h>
#endif
#include "qglobal.h"
#include "private/qglobal_p.h"
#ifdef __OBJC__
#include <Foundation/Foundation.h>

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qplatformdefs.h"
#include "qatomic.h"
#include "qhash.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qstring.h"
#include "QtCore/qstringlist.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qmap.h"
#include "QtCore/qstringlist.h"
#include "QtCore/qreadwritelock.h"

View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#ifndef QT_NO_CRASHHANDLER

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qabstracteventdispatcher.h"
#include <qt_windows.h>

View File

@ -51,7 +51,7 @@
#ifndef QFUNCTIONS_P_H
#define QFUNCTIONS_P_H
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#if defined(Q_OS_VXWORKS)
# include "QtCore/qfunctions_vxworks.h"

View File

@ -52,7 +52,7 @@
#define QJNI_P_H
#include <jni.h>
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qsharedpointer.h>
QT_BEGIN_NAMESPACE

View File

@ -52,7 +52,7 @@
//
#include <jni.h>
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#include <functional>
QT_BEGIN_NAMESPACE

View File

@ -52,6 +52,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
// This function is shared with moc.cpp. This file should be included where needed.

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qobject.h>
#include <QtCore/qmetaobject.h>
#include <QtCore/qdatastream.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qmetatype.h"
QT_BEGIN_NAMESPACE

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qobject.h"
#include "QtCore/qpointer.h"
#include "QtCore/qsharedpointer.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QList>
#include <QMap>
#include <QSharedDataPointer>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <qstring.h>
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
// #define QTIMERINFO_DEBUG
#include "qabstracteventdispatcher.h"

View File

@ -51,6 +51,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
enum {
Q_EQ = 0x01,
Q_LT = 0x02,

View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#ifndef QT_NO_MIMETYPE

View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#ifndef QT_NO_MIMETYPE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qmimetype.h"
#ifndef QT_NO_MIMETYPE

View File

@ -52,7 +52,7 @@
//
#include <qendian.h>
#include <qglobal.h>
#include <private/qglobal_p.h>
#ifndef QT_NO_LIBRARY
#if defined (Q_OF_ELF) && defined(Q_CC_GNU)

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qlibrary.h"
#include "QtCore/qpointer.h"
#include "QtCore/qstringlist.h"

View File

@ -52,7 +52,7 @@
//
#include <qendian.h>
#include <qglobal.h>
#include <private/qglobal_p.h>
#ifndef QT_NO_LIBRARY
#if defined(Q_OF_MACH_O)

View File

@ -51,7 +51,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#ifdef Q_OS_WIN
# include <QtCore/qstring.h>
# include <qt_windows.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qobject.h>
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qelapsedtimer.h>
#include <QtCore/qcoreevent.h>
#include <QtCore/qlist.h>

View File

@ -54,7 +54,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qnamespace.h>
#include <QtCore/qmutex.h>
#include <QtCore/qatomic.h>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qatomic.h"
#include "QtCore/qmutex.h"
#include "QtCore/qvarlengtharray.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qmutex.h>
#include <functional>

View File

@ -52,7 +52,7 @@
// We mean it.
//
#include <QtCore/qglobal.h>
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qhash.h>
#include <QtCore/QWaitCondition>

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <qbytearray.h>
QT_BEGIN_NAMESPACE

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qcollator.h"
#include <QVector>
#ifdef QT_USE_ICU

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qplatformdefs.h"
#include "QtCore/qatomic.h"
#include "QtCore/qdatetime.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "qplatformdefs.h"
#include "QtCore/qatomic.h"
#include "QtCore/qdatetime.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qatomic.h>
QT_BEGIN_NAMESPACE

View File

@ -48,6 +48,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#ifndef QHARFBUZZ_P_H
#define QHARFBUZZ_P_H

View File

@ -51,6 +51,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
/* This part of the file isn't generated, but written by hand since

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include "QtCore/qstring.h"
#include "QtCore/qvarlengtharray.h"
#include "QtCore/qvariant.h"

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qvarlengtharray.h>
QT_BEGIN_NAMESPACE

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qbytearray.h>
#include <QtCore/qlist.h>

View File

@ -48,6 +48,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#ifndef QSCOPEDPOINTER_P_H
#define QSCOPEDPOINTER_P_H

View File

@ -52,7 +52,7 @@
// We mean it.
//
#include <qglobal.h>
#include <QtCore/private/qglobal_p.h>
#include <qatomic.h>
/*

View File

@ -52,6 +52,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qstring.h>
QT_BEGIN_NAMESPACE

View File

@ -52,6 +52,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
QT_BEGIN_NAMESPACE
/*

View File

@ -51,7 +51,7 @@
// We mean it.
//
#include "QtCore/qglobal.h"
#include "QtCore/private/qglobal_p.h"
#include <limits.h>
QT_BEGIN_NAMESPACE

View File

@ -50,6 +50,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#ifndef QUNICODETABLES_P_H
#define QUNICODETABLES_P_H

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qchar.h>
QT_BEGIN_NAMESPACE

View File

@ -48,6 +48,8 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
// This file was generated by qlalr - DO NOT EDIT!
#ifndef QXMLSTREAM_P_H
#define QXMLSTREAM_P_H

View File

@ -51,6 +51,7 @@
// We mean it.
//
#include <QtCore/private/qglobal_p.h>
#include <QtCore/qstring.h>
QT_BEGIN_NAMESPACE