diff options
71 files changed, 197 insertions, 200 deletions
diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp index 33e839325d..346aa7410c 100644 --- a/src/dbus/qdbusunixfiledescriptor.cpp +++ b/src/dbus/qdbusunixfiledescriptor.cpp @@ -41,7 +41,6 @@ #include "qdbusunixfiledescriptor.h" -#include <QSharedData> #ifdef Q_OS_UNIX # include <private/qcore_unix_p.h> diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index ce0a5a0986..fd6cf58360 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -43,7 +43,7 @@ #ifndef QDBUSUNIXFILEDESCRIPTOR_H #define QDBUSUNIXFILEDESCRIPTOR_H -#include <QtCore/QSharedDataPointer> +#include <QtCore/qshareddata.h> #include <QtDBus/qdbusmacros.h> #ifndef QT_NO_DBUS diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 97b7075bac..28369b67ae 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -43,9 +43,9 @@ #include "moc.h" #include "outputrevision.h" #include <qconfig.cpp> -#include <QFile> -#include <QFileInfo> -#include <QDir> +#include <qfile.h> +#include <qfileinfo.h> +#include <qdir.h> #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 66cc942a9f..7d7c718fa0 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -43,10 +43,10 @@ #define MOC_H #include "parser.h" -#include <QStringList> -#include <QMap> -#include <QPair> -#include <QJsonDocument> +#include <qstringlist.h> +#include <qmap.h> +#include <qpair.h> +#include <qjsondocument.h> #include <stdio.h> #include <ctype.h> diff --git a/src/tools/moc/mwerks_mac.h b/src/tools/moc/mwerks_mac.h index 4d7debd7dc..227a7b5672 100644 --- a/src/tools/moc/mwerks_mac.h +++ b/src/tools/moc/mwerks_mac.h @@ -42,7 +42,7 @@ #ifndef MWERKS_MAC_H #define MWERKS_MAC_H -#include <QtGlobal> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/moc/parser.h b/src/tools/moc/parser.h index 654168fb08..1f25a1f1c6 100644 --- a/src/tools/moc/parser.h +++ b/src/tools/moc/parser.h @@ -42,7 +42,7 @@ #ifndef PARSER_H #define PARSER_H -#include <QStack> +#include <qstack.h> #include "symbols.h" QT_BEGIN_NAMESPACE diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index d88c9f2950..c334884735 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -41,10 +41,10 @@ #include "preprocessor.h" #include "utils.h" -#include <QStringList> -#include <QFile> -#include <QDir> -#include <QFileInfo> +#include <qstringlist.h> +#include <qfile.h> +#include <qdir.h> +#include <qfileinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h index e5bc7d4a03..721e64e6c5 100644 --- a/src/tools/moc/preprocessor.h +++ b/src/tools/moc/preprocessor.h @@ -43,8 +43,8 @@ #define PREPROCESSOR_H #include "parser.h" -#include <QList> -#include <QSet> +#include <qlist.h> +#include <qset.h> #include <stdio.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h index a53cc1802e..7568891214 100644 --- a/src/tools/moc/symbols.h +++ b/src/tools/moc/symbols.h @@ -43,10 +43,10 @@ #define SYMBOLS_H #include "token.h" -#include <QString> -#include <QHash> -#include <QVector> -#include <QDebug> +#include <qstring.h> +#include <qhash.h> +#include <qvector.h> +#include <qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp index ff5f4357df..7383362f40 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include <QByteArray> -#include <QString> -#include <QVarLengthArray> -#include <QFile> -#include <QList> -#include <QBuffer> -#include <QRegExp> -#include <QVector> +#include <qbytearray.h> +#include <qstring.h> +#include <qvarlengtharray.h> +#include <qfile.h> +#include <qlist.h> +#include <qbuffer.h> +#include <qregexp.h> +#include <qvector.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp index 6ddd095e8e..27ed7dbfda 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include <QtCore/qbytearray.h> -#include <QtCore/qdatetime.h> -#include <QtCore/qdebug.h> -#include <QtCore/qfile.h> -#include <QtCore/qstring.h> -#include <QtCore/qstringlist.h> -#include <QtCore/qtextstream.h> -#include <QtCore/qset.h> +#include <qbytearray.h> +#include <qdatetime.h> +#include <qdebug.h> +#include <qfile.h> +#include <qstring.h> +#include <qstringlist.h> +#include <qtextstream.h> +#include <qset.h> #include "qdbusmetatype.h" -#include "private/qdbusintrospection_p.h" +#include <qdbusintrospection_p.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/tools/qdoc/atom.cpp b/src/tools/qdoc/atom.cpp index 03638d2d90..e201bc0c4d 100644 --- a/src/tools/qdoc/atom.cpp +++ b/src/tools/qdoc/atom.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QRegExp> +#include <qregexp.h> #include "atom.h" #include "location.h" #include <stdio.h> diff --git a/src/tools/qdoc/codemarker.cpp b/src/tools/qdoc/codemarker.cpp index 4a9305de9e..bb6676c735 100644 --- a/src/tools/qdoc/codemarker.cpp +++ b/src/tools/qdoc/codemarker.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QMetaObject> +#include <qobjectdefs.h> #include "codemarker.h" #include "config.h" #include "node.h" diff --git a/src/tools/qdoc/codeparser.h b/src/tools/qdoc/codeparser.h index 7bca9e0c9b..61a86a256e 100644 --- a/src/tools/qdoc/codeparser.h +++ b/src/tools/qdoc/codeparser.h @@ -42,7 +42,7 @@ #ifndef CODEPARSER_H #define CODEPARSER_H -#include <QSet> +#include <qset.h> #include "node.h" QT_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp index 38596e1bcd..4cbcd28494 100644 --- a/src/tools/qdoc/config.cpp +++ b/src/tools/qdoc/config.cpp @@ -43,11 +43,11 @@ config.cpp */ -#include <QDir> -#include <QVariant> -#include <QFile> -#include <QTemporaryFile> -#include <QTextStream> +#include <qdir.h> +#include <qvariant.h> +#include <qfile.h> +#include <qtemporaryfile.h> +#include <qtextstream.h> #include <qdebug.h> #include "config.h" #include <stdlib.h> diff --git a/src/tools/qdoc/config.h b/src/tools/qdoc/config.h index 4eb851282e..b0929961a2 100644 --- a/src/tools/qdoc/config.h +++ b/src/tools/qdoc/config.h @@ -46,9 +46,9 @@ #ifndef CONFIG_H #define CONFIG_H -#include <QMap> -#include <QSet> -#include <QStringList> +#include <qmap.h> +#include <qset.h> +#include <qstringlist.h> #include "location.h" diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index fa09cd3657..8ece10915c 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -43,11 +43,11 @@ ditaxmlgenerator.cpp */ -#include <QDebug> -#include <QList> +#include <qdebug.h> +#include <qlist.h> #include <qiterator.h> -#include <QTextCodec> -#include <QUuid> +#include <qtextcodec.h> +#include <quuid.h> #include "codemarker.h" #include "codeparser.h" #include "ditaxmlgenerator.h" diff --git a/src/tools/qdoc/ditaxmlgenerator.h b/src/tools/qdoc/ditaxmlgenerator.h index 9f82726ba8..2471b2a65d 100644 --- a/src/tools/qdoc/ditaxmlgenerator.h +++ b/src/tools/qdoc/ditaxmlgenerator.h @@ -44,7 +44,7 @@ #include <qmap.h> #include <qregexp.h> -#include <QXmlStreamWriter> +#include <qxmlstream.h> #include "codemarker.h" #include "config.h" #include "generator.h" diff --git a/src/tools/qdoc/doc.h b/src/tools/qdoc/doc.h index dc781f4856..354feba55d 100644 --- a/src/tools/qdoc/doc.h +++ b/src/tools/qdoc/doc.h @@ -46,9 +46,9 @@ #ifndef DOC_H #define DOC_H -#include <QSet> -#include <QString> -#include <QMap> +#include <qset.h> +#include <qstring.h> +#include <qmap.h> #include "location.h" diff --git a/src/tools/qdoc/editdistance.h b/src/tools/qdoc/editdistance.h index d8e8fe29aa..6a6144f814 100644 --- a/src/tools/qdoc/editdistance.h +++ b/src/tools/qdoc/editdistance.h @@ -46,8 +46,8 @@ #ifndef EDITDISTANCE_H #define EDITDISTANCE_H -#include <QSet> -#include <QString> +#include <qset.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 23003de806..2c42467ca5 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -42,8 +42,8 @@ /* generator.cpp */ -#include <QDir> -#include <QDebug> +#include <qdir.h> +#include <qdebug.h> #include "codemarker.h" #include "config.h" #include "ditaxmlgenerator.h" diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h index 11e842a7c7..86bc8cd1b7 100644 --- a/src/tools/qdoc/generator.h +++ b/src/tools/qdoc/generator.h @@ -42,14 +42,14 @@ #ifndef GENERATOR_H #define GENERATOR_H -#include <QFile> -#include <QFileInfo> -#include <QList> -#include <QMap> -#include <QRegExp> -#include <QString> -#include <QStringList> -#include <QTextStream> +#include <qfile.h> +#include <qfileinfo.h> +#include <qlist.h> +#include <qmap.h> +#include <qregexp.h> +#include <qstring.h> +#include <qstringlist.h> +#include <qtextstream.h> #include "node.h" #include "text.h" diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index 0a61bd62e4..fa06c1e6f6 100644 --- a/src/tools/qdoc/helpprojectwriter.cpp +++ b/src/tools/qdoc/helpprojectwriter.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include <QCryptographicHash> -#include <QDebug> -#include <QHash> -#include <QMap> +#include <qcryptographichash.h> +#include <qdebug.h> +#include <qhash.h> +#include <qmap.h> #include "atom.h" #include "helpprojectwriter.h" diff --git a/src/tools/qdoc/helpprojectwriter.h b/src/tools/qdoc/helpprojectwriter.h index c6c3871b2d..066412f145 100644 --- a/src/tools/qdoc/helpprojectwriter.h +++ b/src/tools/qdoc/helpprojectwriter.h @@ -42,9 +42,8 @@ #ifndef HELPPROJECTWRITER_H #define HELPPROJECTWRITER_H -#include <QString> -#include <QXmlStreamReader> -#include <QXmlStreamWriter> +#include <qstring.h> +#include <qxmlstream.h> #include "config.h" #include "node.h" diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 558b0c6248..53eea2a001 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -56,7 +56,7 @@ #include <qlist.h> #include <qiterator.h> #include <qtextcodec.h> -#include <QUuid> +#include <quuid.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h index 18a2d396d0..1fffd2301b 100644 --- a/src/tools/qdoc/htmlgenerator.h +++ b/src/tools/qdoc/htmlgenerator.h @@ -46,9 +46,9 @@ #ifndef HTMLGENERATOR_H #define HTMLGENERATOR_H -#include <QMap> -#include <QRegExp> -#include <QXmlStreamWriter> +#include <qmap.h> +#include <qregexp.h> +#include <qxmlstream.h> #include "codemarker.h" #include "config.h" #include "generator.h" diff --git a/src/tools/qdoc/location.cpp b/src/tools/qdoc/location.cpp index 2d7457d61f..91b0e2b7a8 100644 --- a/src/tools/qdoc/location.cpp +++ b/src/tools/qdoc/location.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtDebug> +#include <qdebug.h> #include "config.h" #include "location.h" diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index 2e0c1c9933..c7392d1f7e 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -43,7 +43,7 @@ #include "tree.h" #include "codemarker.h" #include "codeparser.h" -#include <QUuid> +#include <quuid.h> #include "qdocdatabase.h" #include <qdebug.h> diff --git a/src/tools/qdoc/puredocparser.h b/src/tools/qdoc/puredocparser.h index 8ca7c2f1f0..134ef752cf 100644 --- a/src/tools/qdoc/puredocparser.h +++ b/src/tools/qdoc/puredocparser.h @@ -46,7 +46,7 @@ #ifndef PUREDOCPARSER_H #define PUREDOCPARSER_H -#include <QSet> +#include <qset.h> #include "cppcodeparser.h" #include "location.h" diff --git a/src/tools/qdoc/qdocdatabase.h b/src/tools/qdoc/qdocdatabase.h index 3fed961c33..e907486919 100644 --- a/src/tools/qdoc/qdocdatabase.h +++ b/src/tools/qdoc/qdocdatabase.h @@ -42,8 +42,8 @@ #ifndef QDOCDATABASE_H #define QDOCDATABASE_H -#include <QString> -#include <QMultiMap> +#include <qstring.h> +#include <qmap.h> #include "tree.h" QT_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlcodeparser.h b/src/tools/qdoc/qmlcodeparser.h index 1ee6560e8e..c36a3b5f2b 100644 --- a/src/tools/qdoc/qmlcodeparser.h +++ b/src/tools/qdoc/qmlcodeparser.h @@ -46,7 +46,7 @@ #ifndef QMLCODEPARSER_H #define QMLCODEPARSER_H -#include <QSet> +#include <qset.h> #include "qqmljsengine_p.h" #include "qqmljslexer_p.h" #include "qqmljsparser_p.h" diff --git a/src/tools/qdoc/qmlmarkupvisitor.cpp b/src/tools/qdoc/qmlmarkupvisitor.cpp index 0b1883723f..87eb08cd14 100644 --- a/src/tools/qdoc/qmlmarkupvisitor.cpp +++ b/src/tools/qdoc/qmlmarkupvisitor.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QStringList> -#include <QtGlobal> +#include <qstringlist.h> +#include <qglobal.h> #include "qqmljsast_p.h" #include "qqmljsastfwd_p.h" #include "qqmljsengine_p.h" diff --git a/src/tools/qdoc/qmlmarkupvisitor.h b/src/tools/qdoc/qmlmarkupvisitor.h index 81c6e609fa..118fa7069a 100644 --- a/src/tools/qdoc/qmlmarkupvisitor.h +++ b/src/tools/qdoc/qmlmarkupvisitor.h @@ -42,7 +42,7 @@ #ifndef QMLMARKUPVISITOR_H #define QMLMARKUPVISITOR_H -#include <QString> +#include <qstring.h> #include "qqmljsastvisitor_p.h" #include "node.h" #include "tree.h" diff --git a/src/tools/qdoc/qmlparser/qqmljs.g b/src/tools/qdoc/qmlparser/qqmljs.g index 746fcb24df..5e63bff688 100644 --- a/src/tools/qdoc/qmlparser/qqmljs.g +++ b/src/tools/qdoc/qmlparser/qqmljs.g @@ -124,8 +124,8 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> -#include <QtCore/QCoreApplication> +#include <qdebug.h> +#include <qcoreapplication.h> #include <string.h> @@ -202,8 +202,8 @@ #include "qqmljsast_p.h" #include "qqmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <qlist.h> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE @@ -380,7 +380,7 @@ protected: /. #include "qqmljsparser_p.h" -#include <QVarLengthArray> +#include <qvarlengtharray.h> // // This file is automatically generated from qmljs.g. diff --git a/src/tools/qdoc/qmlparser/qqmljsast_p.h b/src/tools/qdoc/qmlparser/qqmljsast_p.h index 5de94d2ee2..d1014263a0 100644 --- a/src/tools/qdoc/qmlparser/qqmljsast_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsast_p.h @@ -57,7 +57,7 @@ #include "qqmljsglobal_p.h" #include "qqmljsmemorypool_p.h" -#include <QtCore/QString> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h b/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h index 602cbeb6cd..8ecf75081b 100644 --- a/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h @@ -44,7 +44,7 @@ #include "qqmljsglobal_p.h" -#include <QtCore/qglobal.h> +#include <qglobal.h> // // W A R N I N G diff --git a/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp b/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp index 459ba8d7dc..29bac8f521 100644 --- a/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp +++ b/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp @@ -43,8 +43,8 @@ #include "qqmljsglobal_p.h" #include <qnumeric.h> -#include <QHash> -#include <QDebug> +#include <qhash.h> +#include <qdebug.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljsengine_p.h b/src/tools/qdoc/qmlparser/qqmljsengine_p.h index 3cb78de4eb..b633f00fbc 100644 --- a/src/tools/qdoc/qmlparser/qqmljsengine_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsengine_p.h @@ -57,8 +57,8 @@ #include "qqmljsastfwd_p.h" #include "qqmljsmemorypool_p.h" -#include <QString> -#include <QSet> +#include <qstring.h> +#include <qset.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljslexer.cpp b/src/tools/qdoc/qmlparser/qqmljslexer.cpp index 537e4297e0..fd6247bf36 100644 --- a/src/tools/qdoc/qmlparser/qqmljslexer.cpp +++ b/src/tools/qdoc/qmlparser/qqmljslexer.cpp @@ -46,11 +46,11 @@ #ifdef QT_BOOTSTRAPPED #define tr(x, y) QString(QLatin1String(y)) #else -#include <QtCore/QCoreApplication> +#include <qcoreapplication.h> #define tr(x, y) QCoreApplication::translate(x, y) #endif -#include <QtCore/QVarLengthArray> -#include <QtCore/QDebug> +#include <qvarlengtharray.h> +#include <qdebug.h> QT_BEGIN_NAMESPACE Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); diff --git a/src/tools/qdoc/qmlparser/qqmljslexer_p.h b/src/tools/qdoc/qmlparser/qqmljslexer_p.h index 6b51852f5f..827da4aa4f 100644 --- a/src/tools/qdoc/qmlparser/qqmljslexer_p.h +++ b/src/tools/qdoc/qmlparser/qqmljslexer_p.h @@ -55,7 +55,7 @@ #include "qqmljsglobal_p.h" #include "qqmljsgrammar_p.h" -#include <QtCore/QString> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlparser/qqmljsparser.cpp b/src/tools/qdoc/qmlparser/qqmljsparser.cpp index 431351b8b2..961441a8e7 100644 --- a/src/tools/qdoc/qmlparser/qqmljsparser.cpp +++ b/src/tools/qdoc/qmlparser/qqmljsparser.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include <QtCore/QtDebug> +#include <qdebug.h> #ifdef QT_BOOTSTRAPPED #define tr(x, y) QString(QLatin1String(y)) #else -#include <QtCore/QCoreApplication> +#include <qcoreapplication.h> #define tr(x, y) QCoreApplication::translate(x, y) #endif @@ -57,7 +57,7 @@ #include "qqmljsparser_p.h" -#include <QVarLengthArray> +#include <qvarlengtharray.h> // // This file is automatically generated from qmljs.g. diff --git a/src/tools/qdoc/qmlparser/qqmljsparser_p.h b/src/tools/qdoc/qmlparser/qqmljsparser_p.h index ad532c32c7..6d385688bb 100644 --- a/src/tools/qdoc/qmlparser/qqmljsparser_p.h +++ b/src/tools/qdoc/qmlparser/qqmljsparser_p.h @@ -64,8 +64,8 @@ #include "qqmljsast_p.h" #include "qqmljsengine_p.h" -#include <QtCore/QList> -#include <QtCore/QString> +#include <qlist.h> +#include <qstring.h> QT_QML_BEGIN_NAMESPACE diff --git a/src/tools/qdoc/qmlvisitor.cpp b/src/tools/qdoc/qmlvisitor.cpp index d985e33ba2..e43bf34829 100644 --- a/src/tools/qdoc/qmlvisitor.cpp +++ b/src/tools/qdoc/qmlvisitor.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include <QFileInfo> -#include <QStringList> -#include <QtGlobal> +#include <qfileinfo.h> +#include <qstringlist.h> +#include <qglobal.h> #include "qqmljsast_p.h" #include "qqmljsastfwd_p.h" #include "qqmljsengine_p.h" diff --git a/src/tools/qdoc/qmlvisitor.h b/src/tools/qdoc/qmlvisitor.h index 3b45af6850..863dfabfea 100644 --- a/src/tools/qdoc/qmlvisitor.h +++ b/src/tools/qdoc/qmlvisitor.h @@ -42,7 +42,7 @@ #ifndef QMLVISITOR_H #define QMLVISITOR_H -#include <QString> +#include <qstring.h> #include "qqmljsastvisitor_p.h" #include "node.h" #include "tree.h" diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index 8145816397..53f2c47e1c 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -43,7 +43,7 @@ tree.cpp */ -#include <QDomDocument> +#include <qdom.h> #include "atom.h" #include "doc.h" #include "htmlgenerator.h" diff --git a/src/tools/qdoc/tree.h b/src/tools/qdoc/tree.h index c201a31cd5..e893cd04b6 100644 --- a/src/tools/qdoc/tree.h +++ b/src/tools/qdoc/tree.h @@ -47,8 +47,8 @@ #define TREE_H #include "node.h" -#include <QDomElement> -#include <QXmlStreamWriter> +#include <qdom.h> +#include <qxmlstream.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 03c6976eec..14db094f6d 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -42,13 +42,13 @@ #include <rcc.h> #include "../../corelib/kernel/qcorecmdlineargs_p.h" -#include <QDebug> -#include <QDir> -#include <QFile> -#include <QFileInfo> -#include <QTextStream> -#include <QAtomicInt> -#include <QtGlobal> +#include <qdebug.h> +#include <qdir.h> +#include <qfile.h> +#include <qfileinfo.h> +#include <qtextstream.h> +#include <qatomic.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 32aba07b37..3b8100590c 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -41,16 +41,16 @@ #include "rcc.h" -#include <QtCore/QByteArray> -#include <QtCore/QDateTime> -#include <QtCore/QDebug> -#include <QtCore/QDir> -#include <QtCore/QDirIterator> -#include <QtCore/QFile> -#include <QtCore/QIODevice> -#include <QtCore/QLocale> -#include <QtCore/QStack> -#include <QtCore/QXmlStreamReader> +#include <qbytearray.h> +#include <qdatetime.h> +#include <qdebug.h> +#include <qdir.h> +#include <qdiriterator.h> +#include <qfile.h> +#include <qiodevice.h> +#include <qlocale.h> +#include <qstack.h> +#include <qxmlstream.h> // Note: A copy of this file is used in Qt Designer (qttools/src/designer/src/lib/shared/rcc.cpp) diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h index a808f576c5..7d0fb4dd76 100644 --- a/src/tools/rcc/rcc.h +++ b/src/tools/rcc/rcc.h @@ -44,9 +44,9 @@ #ifndef RCC_H #define RCC_H -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QString> +#include <qstringlist.h> +#include <qhash.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppextractimages.cpp b/src/tools/uic/cpp/cppextractimages.cpp index 7dca6320d7..6bc33b10c8 100644 --- a/src/tools/uic/cpp/cppextractimages.cpp +++ b/src/tools/uic/cpp/cppextractimages.cpp @@ -46,12 +46,12 @@ #include "utils.h" #include "uic.h" -#include <QtCore/QDataStream> -#include <QtCore/QTextStream> -#include <QtCore/QTextCodec> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> +#include <qdatastream.h> +#include <qtextstream.h> +#include <qtextcodec.h> +#include <qdir.h> +#include <qfile.h> +#include <qfileinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h index 5b08d01e94..93c0580a64 100644 --- a/src/tools/uic/cpp/cppextractimages.h +++ b/src/tools/uic/cpp/cppextractimages.h @@ -43,7 +43,7 @@ #define CPPEXTRACTIMAGES_H #include "treewalker.h" -#include <QtCore/QDir> +#include <qdir.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp index 9b97000a06..4426ec22b4 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.cpp +++ b/src/tools/uic/cpp/cppwritedeclaration.cpp @@ -50,8 +50,8 @@ #include "databaseinfo.h" #include "customwidgetsinfo.h" -#include <QtCore/QTextStream> -#include <QtCore/QDebug> +#include <qtextstream.h> +#include <qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppwriteicondata.cpp b/src/tools/uic/cpp/cppwriteicondata.cpp index 082961cfe6..e262b9f18f 100644 --- a/src/tools/uic/cpp/cppwriteicondata.cpp +++ b/src/tools/uic/cpp/cppwriteicondata.cpp @@ -44,7 +44,7 @@ #include "ui4.h" #include "uic.h" -#include <QtCore/QTextStream> +#include <qtextstream.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.cpp b/src/tools/uic/cpp/cppwriteicondeclaration.cpp index 91822b0e92..9f063b5d10 100644 --- a/src/tools/uic/cpp/cppwriteicondeclaration.cpp +++ b/src/tools/uic/cpp/cppwriteicondeclaration.cpp @@ -44,7 +44,7 @@ #include "ui4.h" #include "uic.h" -#include <QtCore/QTextStream> +#include <qtextstream.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.cpp b/src/tools/uic/cpp/cppwriteiconinitialization.cpp index a026d27798..2bef93050e 100644 --- a/src/tools/uic/cpp/cppwriteiconinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteiconinitialization.cpp @@ -46,8 +46,8 @@ #include "utils.h" #include "uic.h" -#include <QtCore/QTextStream> -#include <QtCore/QString> +#include <qtextstream.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index 4c5edf7190..9b2c872b10 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -45,9 +45,9 @@ #include "uic.h" #include "databaseinfo.h" -#include <QtCore/QDebug> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> +#include <qdebug.h> +#include <qfileinfo.h> +#include <qtextstream.h> #include <stdio.h> diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 9ad4008b08..61a055dd44 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -44,10 +44,10 @@ #include "treewalker.h" -#include <QtCore/QHash> -#include <QtCore/QMap> -#include <QtCore/QSet> -#include <QtCore/QString> +#include <qhash.h> +#include <qmap.h> +#include <qset.h> +#include <qstring.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 402295d2a8..80ca5ce5dd 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -48,8 +48,8 @@ #include "databaseinfo.h" #include "globaldefs.h" -#include <QtCore/QTextStream> -#include <QtCore/QDebug> +#include <qtextstream.h> +#include <qdebug.h> #include <ctype.h> diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index e82998ec3c..27979349b7 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -43,12 +43,12 @@ #define CPPWRITEINITIALIZATION_H #include "treewalker.h" -#include <QtCore/QPair> -#include <QtCore/QHash> -#include <QtCore/QSet> -#include <QtCore/QMap> -#include <QtCore/QStack> -#include <QtCore/QTextStream> +#include <qpair.h> +#include <qhash.h> +#include <qset.h> +#include <qmap.h> +#include <qstack.h> +#include <qtextstream.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h index 7cc0e28642..002a2cef78 100644 --- a/src/tools/uic/customwidgetsinfo.h +++ b/src/tools/uic/customwidgetsinfo.h @@ -43,8 +43,8 @@ #define CUSTOMWIDGETSINFO_H #include "treewalker.h" -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <qstringlist.h> +#include <qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h index 8dd2bae1cd..51ecff7612 100644 --- a/src/tools/uic/databaseinfo.h +++ b/src/tools/uic/databaseinfo.h @@ -43,8 +43,8 @@ #define DATABASEINFO_H #include "treewalker.h" -#include <QtCore/QStringList> -#include <QtCore/QMap> +#include <qstringlist.h> +#include <qmap.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index 9ef6fcb387..9ef2c79f82 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -43,8 +43,8 @@ #include "uic.h" #include "ui4.h" -#include <QtCore/QFileInfo> -#include <QtCore/QDebug> +#include <qfileinfo.h> +#include <qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h index 07f330471e..603c502a51 100644 --- a/src/tools/uic/driver.h +++ b/src/tools/uic/driver.h @@ -43,10 +43,10 @@ #define DRIVER_H #include "option.h" -#include <QtCore/QHash> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QTextStream> +#include <qhash.h> +#include <qstring.h> +#include <qstringlist.h> +#include <qtextstream.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/globaldefs.h b/src/tools/uic/globaldefs.h index e43a2e946e..832c5f2632 100644 --- a/src/tools/uic/globaldefs.h +++ b/src/tools/uic/globaldefs.h @@ -42,7 +42,7 @@ #ifndef GLOBALDEFS_H #define GLOBALDEFS_H -#include <QtCore/qglobal.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index 7a5b9e684f..5e73b58a1d 100644 --- a/src/tools/uic/main.cpp +++ b/src/tools/uic/main.cpp @@ -43,10 +43,10 @@ #include "option.h" #include "driver.h" #include "../../corelib/global/qconfig.cpp" -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QTextStream> -#include <QtCore/QTextCodec> +#include <qfile.h> +#include <qdir.h> +#include <qtextstream.h> +#include <qtextcodec.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h index c5fd48267c..18ceeded3d 100644 --- a/src/tools/uic/option.h +++ b/src/tools/uic/option.h @@ -42,8 +42,8 @@ #ifndef OPTION_H #define OPTION_H -#include <QtCore/QString> -#include <QtCore/QDir> +#include <qstring.h> +#include <qdir.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h index 1507ac2c94..3a04a261b9 100644 --- a/src/tools/uic/treewalker.h +++ b/src/tools/uic/treewalker.h @@ -42,7 +42,7 @@ #ifndef TREEWALKER_H #define TREEWALKER_H -#include <QtCore/QList> +#include <qlist.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h index c1458b4983..2575a72a98 100644 --- a/src/tools/uic/ui4.h +++ b/src/tools/uic/ui4.h @@ -55,12 +55,11 @@ #ifndef UI4_H #define UI4_H -#include <QtCore/QList> -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QXmlStreamReader> -#include <QtCore/QXmlStreamWriter> -#include <QtCore/qglobal.h> +#include <qlist.h> +#include <qstring.h> +#include <qstringlist.h> +#include <qxmlstream.h> +#include <qglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index 4ae04149e8..d3572d9873 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -56,10 +56,10 @@ #include "javawritedeclaration.h" #endif -#include <QtCore/QXmlStreamReader> -#include <QtCore/QFileInfo> -#include <QtCore/QTextStream> -#include <QtCore/QDateTime> +#include <qxmlstream.h> +#include <qfileinfo.h> +#include <qtextstream.h> +#include <qdatetime.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h index 431f3d1f07..7e68ea6ae2 100644 --- a/src/tools/uic/uic.h +++ b/src/tools/uic/uic.h @@ -44,11 +44,11 @@ #include "databaseinfo.h" #include "customwidgetsinfo.h" -#include <QtCore/QString> -#include <QtCore/QStringList> -#include <QtCore/QHash> -#include <QtCore/QStack> -#include <QtCore/QXmlStreamReader> +#include <qstring.h> +#include <qstringlist.h> +#include <qhash.h> +#include <qstack.h> +#include <qxmlstream.h> QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h index b2214d9c38..e2e24a4fa8 100644 --- a/src/tools/uic/utils.h +++ b/src/tools/uic/utils.h @@ -43,9 +43,9 @@ #define UTILS_H #include "ui4.h" -#include <QtCore/QString> -#include <QtCore/QList> -#include <QtCore/QHash> +#include <qstring.h> +#include <qlist.h> +#include <qhash.h> QT_BEGIN_NAMESPACE |