diff options
Diffstat (limited to 'src/tools/qdoc')
35 files changed, 77 insertions, 78 deletions
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 |