From c83bf647fb84f0bee5cc9894dd0c58f661194932 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Tue, 30 Jul 2019 15:49:11 +0200 Subject: QDoc: Ensure all includes are uniform and according to style Housekeeping. Includes are organized after recommended best practice and organized in the following order: - include self (i.e. include own header) - include local files - include Qt, e.g. - include Qt private - include externals, e.g. stdio.h in alphabetic order within each block, aside from accommodating #if-ery, in which includes follow the block they belong to. Also, updated copyright notice to year of latest edit in each file. Change-Id: I1e6b215f172fd5373d57016f7678b88b9e73231e Reviewed-by: Edward Welbourne --- src/qdoc/atom.cpp | 9 ++++++--- src/qdoc/atom.h | 7 ++++--- src/qdoc/clangcodeparser.cpp | 4 ++-- src/qdoc/clangcodeparser.h | 6 +++--- src/qdoc/codechunk.cpp | 8 ++++---- src/qdoc/codechunk.h | 4 ++-- src/qdoc/codemarker.cpp | 9 ++++++--- src/qdoc/codeparser.cpp | 10 ++++++---- src/qdoc/codeparser.h | 5 +++-- src/qdoc/config.cpp | 2 +- src/qdoc/config.h | 2 +- src/qdoc/cppcodemarker.cpp | 11 +++++++---- src/qdoc/cppcodemarker.h | 2 +- src/qdoc/cppcodeparser.cpp | 14 ++++++++------ src/qdoc/cppcodeparser.h | 2 +- src/qdoc/doc.cpp | 27 +++++++++++++++------------ src/qdoc/doc.h | 10 +++++----- src/qdoc/editdistance.h | 6 +++--- src/qdoc/generator.cpp | 4 ++-- src/qdoc/generator.h | 17 +++++++---------- src/qdoc/helpprojectwriter.cpp | 16 ++++++++-------- src/qdoc/helpprojectwriter.h | 8 ++++---- src/qdoc/htmlgenerator.cpp | 21 ++++++++++++--------- src/qdoc/htmlgenerator.h | 9 +++++---- src/qdoc/jscodemarker.cpp | 4 ++-- src/qdoc/jscodemarker.h | 2 +- src/qdoc/location.cpp | 18 ++++++++++-------- src/qdoc/location.h | 6 +++--- src/qdoc/main.cpp | 29 +++++++++++++++-------------- src/qdoc/node.cpp | 14 ++++++++------ src/qdoc/node.h | 15 ++++++++------- src/qdoc/openedlist.cpp | 7 ++++--- src/qdoc/openedlist.h | 6 +++--- src/qdoc/parameters.cpp | 5 +++-- src/qdoc/parameters.h | 8 ++++---- src/qdoc/puredocparser.cpp | 10 ++++++---- src/qdoc/qdoccommandlineparser.cpp | 2 +- src/qdoc/qdoccommandlineparser.h | 2 +- src/qdoc/qdocdatabase.cpp | 14 ++++++++------ src/qdoc/qdocdatabase.h | 11 ++++++----- src/qdoc/qdocindexfiles.cpp | 16 +++++++++------- src/qdoc/qdocindexfiles.h | 3 ++- src/qdoc/qdoctagfiles.cpp | 9 +++++---- src/qdoc/qdoctagfiles.h | 4 ++-- src/qdoc/qmlcodemarker.cpp | 2 +- src/qdoc/qmlcodemarker.h | 2 +- src/qdoc/qmlcodeparser.cpp | 2 +- src/qdoc/qmlcodeparser.h | 5 +++-- src/qdoc/qmlmarkupvisitor.cpp | 7 ++++--- src/qdoc/qmlmarkupvisitor.h | 5 +++-- src/qdoc/qmlvisitor.cpp | 15 ++++++++------- src/qdoc/qmlvisitor.h | 5 +++-- src/qdoc/quoter.cpp | 10 +++++----- src/qdoc/quoter.h | 8 ++++---- src/qdoc/sections.cpp | 11 +++++++---- src/qdoc/sections.h | 5 +++-- src/qdoc/separator.cpp | 5 +++-- src/qdoc/separator.h | 4 ++-- src/qdoc/text.cpp | 6 ++++-- src/qdoc/text.h | 2 +- src/qdoc/tokenizer.cpp | 15 ++++++++------- src/qdoc/tokenizer.h | 10 +++++----- src/qdoc/tree.cpp | 11 +++++++---- src/qdoc/tree.h | 5 +++-- src/qdoc/webxmlgenerator.cpp | 7 ++++--- src/qdoc/webxmlgenerator.h | 6 +++--- src/qdoc/yyindent.cpp | 6 +++--- 67 files changed, 303 insertions(+), 249 deletions(-) diff --git a/src/qdoc/atom.cpp b/src/qdoc/atom.cpp index 43a164ada..4cae4cb29 100644 --- a/src/qdoc/atom.cpp +++ b/src/qdoc/atom.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,12 +26,15 @@ ** ****************************************************************************/ -#include #include "atom.h" + #include "location.h" #include "qdocdatabase.h" + +#include +#include + #include -#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/atom.h b/src/qdoc/atom.h index b72264d18..9e8bab77b 100644 --- a/src/qdoc/atom.h +++ b/src/qdoc/atom.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,9 +29,10 @@ #ifndef ATOM_H #define ATOM_H -#include #include "node.h" -#include + +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index 3891499fc..827a5cb0b 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -57,8 +57,8 @@ #include -#include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/clangcodeparser.h b/src/qdoc/clangcodeparser.h index a022ca9d3..e1c9d7e30 100644 --- a/src/qdoc/clangcodeparser.h +++ b/src/qdoc/clangcodeparser.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -40,10 +40,10 @@ #ifndef CLANGCODEPARSER_H #define CLANGCODEPARSER_H -#include - #include "cppcodeparser.h" +#include + QT_BEGIN_NAMESPACE class ClangCodeParser : public CppCodeParser diff --git a/src/qdoc/codechunk.cpp b/src/qdoc/codechunk.cpp index 54d7f3131..05aa5c444 100644 --- a/src/qdoc/codechunk.cpp +++ b/src/qdoc/codechunk.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -30,11 +30,11 @@ codechunk.cpp */ -#include -#include - #include "codechunk.h" +#include +#include + QT_BEGIN_NAMESPACE enum { Other, Alnum, Gizmo, Comma, LBrace, RBrace, RAngle, Colon, Paren }; diff --git a/src/qdoc/codechunk.h b/src/qdoc/codechunk.h index 0e1d3d2b4..4f2f5bd0b 100644 --- a/src/qdoc/codechunk.h +++ b/src/qdoc/codechunk.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,7 +33,7 @@ #ifndef CODECHUNK_H #define CODECHUNK_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/codemarker.cpp b/src/qdoc/codemarker.cpp index 3c88edf03..a1ef6efef 100644 --- a/src/qdoc/codemarker.cpp +++ b/src/qdoc/codemarker.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,11 +26,14 @@ ** ****************************************************************************/ -#include #include "codemarker.h" + #include "config.h" #include "node.h" -#include + +#include +#include + #include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/codeparser.cpp b/src/qdoc/codeparser.cpp index 860836c3d..83ae25e55 100644 --- a/src/qdoc/codeparser.cpp +++ b/src/qdoc/codeparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -31,12 +31,14 @@ */ #include "codeparser.h" -#include "node.h" -#include "tree.h" + #include "config.h" #include "generator.h" +#include "node.h" #include "qdocdatabase.h" -#include +#include "tree.h" + +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/codeparser.h b/src/qdoc/codeparser.h index 56183a2f8..ca2365cda 100644 --- a/src/qdoc/codeparser.h +++ b/src/qdoc/codeparser.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,9 +29,10 @@ #ifndef CODEPARSER_H #define CODEPARSER_H -#include #include "node.h" +#include + QT_BEGIN_NAMESPACE class Config; diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp index db0a7725e..ed277e98a 100644 --- a/src/qdoc/config.cpp +++ b/src/qdoc/config.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/config.h b/src/qdoc/config.h index 401669df7..37b677999 100644 --- a/src/qdoc/config.h +++ b/src/qdoc/config.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp index b1c7b1489..9b5acf9ce 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -31,12 +31,15 @@ */ #include "cppcodemarker.h" + +#include "generator.h" #include "text.h" #include "tree.h" -#include -#include + +#include +#include + #include -#include "generator.h" QT_BEGIN_NAMESPACE diff --git a/src/qdoc/cppcodemarker.h b/src/qdoc/cppcodemarker.h index 23a54ca79..24a672261 100644 --- a/src/qdoc/cppcodemarker.h +++ b/src/qdoc/cppcodemarker.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 2f5288ba8..a5e498f07 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -30,16 +30,18 @@ cppcodeparser.cpp */ -#include -#include -#include -#include "config.h" #include "cppcodeparser.h" + +#include "config.h" #include "qdocdatabase.h" -#include #include "generator.h" +#include +#include + #include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/cppcodeparser.h index 3d3f6a52c..e0c866fe1 100644 --- a/src/qdoc/cppcodeparser.h +++ b/src/qdoc/cppcodeparser.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/doc.cpp b/src/qdoc/doc.cpp index b31125597..c149f366d 100644 --- a/src/qdoc/doc.cpp +++ b/src/qdoc/doc.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,26 +26,29 @@ ** ****************************************************************************/ -#include "config.h" #include "doc.h" + +#include "atom.h" +#include "config.h" #include "codemarker.h" #include "editdistance.h" +#include "generator.h" +#include "loggingcategory.h" #include "openedlist.h" #include "quoter.h" #include "text.h" -#include "atom.h" #include "tokenizer.h" -#include "loggingcategory.h" -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include + #include #include -#include -#include "generator.h" QT_BEGIN_NAMESPACE diff --git a/src/qdoc/doc.h b/src/qdoc/doc.h index ee3221a2d..d6b63fd4d 100644 --- a/src/qdoc/doc.h +++ b/src/qdoc/doc.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,12 +33,12 @@ #ifndef DOC_H #define DOC_H -#include -#include -#include - #include "location.h" +#include +#include +#include + QT_BEGIN_NAMESPACE class Atom; diff --git a/src/qdoc/editdistance.h b/src/qdoc/editdistance.h index e67095fdd..63471b3b1 100644 --- a/src/qdoc/editdistance.h +++ b/src/qdoc/editdistance.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,8 +33,8 @@ #ifndef EDITDISTANCE_H #define EDITDISTANCE_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 82a43dc4c..93d4c9af1 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -37,10 +37,10 @@ #include "editdistance.h" #include "loggingcategory.h" #include "openedlist.h" +#include "qdocdatabase.h" #include "quoter.h" #include "separator.h" #include "tokenizer.h" -#include "qdocdatabase.h" #include #include diff --git a/src/qdoc/generator.h b/src/qdoc/generator.h index d02c59f44..68b788beb 100644 --- a/src/qdoc/generator.h +++ b/src/qdoc/generator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,18 +29,15 @@ #ifndef GENERATOR_H #define GENERATOR_H -#include -#include -#include -#include -#include -#include -#include -#include -#include "config.h" #include "node.h" #include "text.h" +#include +#include +#include +#include +#include + QT_BEGIN_NAMESPACE typedef QMultiMap NodeMultiMap; diff --git a/src/qdoc/helpprojectwriter.cpp b/src/qdoc/helpprojectwriter.cpp index e7d877993..c3840d83f 100644 --- a/src/qdoc/helpprojectwriter.cpp +++ b/src/qdoc/helpprojectwriter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,18 +26,18 @@ ** ****************************************************************************/ -#include -#include -#include -#include +#include "helpprojectwriter.h" #include "atom.h" -#include "helpprojectwriter.h" -#include "htmlgenerator.h" #include "config.h" +#include "htmlgenerator.h" #include "node.h" #include "qdocdatabase.h" -#include + +#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/helpprojectwriter.h b/src/qdoc/helpprojectwriter.h index bee6620ec..05460769c 100644 --- a/src/qdoc/helpprojectwriter.h +++ b/src/qdoc/helpprojectwriter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,12 +29,12 @@ #ifndef HELPPROJECTWRITER_H #define HELPPROJECTWRITER_H -#include -#include - #include "config.h" #include "node.h" +#include +#include + QT_BEGIN_NAMESPACE class QDocDatabase; diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 7ec27ff8e..47b833ba5 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -30,24 +30,27 @@ htmlgenerator.cpp */ +#include "htmlgenerator.h" + #include "codemarker.h" #include "codeparser.h" #include "helpprojectwriter.h" -#include "htmlgenerator.h" #include "node.h" #include "qdocdatabase.h" #include "separator.h" #include "tree.h" #include "quoter.h" -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include #include +#include + QT_BEGIN_NAMESPACE int HtmlGenerator::id = 0; diff --git a/src/qdoc/htmlgenerator.h b/src/qdoc/htmlgenerator.h index 0c897483b..ac2ed2f3c 100644 --- a/src/qdoc/htmlgenerator.h +++ b/src/qdoc/htmlgenerator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,13 +33,14 @@ #ifndef HTMLGENERATOR_H #define HTMLGENERATOR_H -#include -#include -#include #include "codemarker.h" #include "config.h" #include "generator.h" +#include +#include +#include + QT_BEGIN_NAMESPACE class HelpProjectWriter; diff --git a/src/qdoc/jscodemarker.cpp b/src/qdoc/jscodemarker.cpp index 575ffbb58..6a26fce2e 100644 --- a/src/qdoc/jscodemarker.cpp +++ b/src/qdoc/jscodemarker.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,11 +33,11 @@ #include "jscodemarker.h" #include "atom.h" +#include "generator.h" #include "node.h" #include "qmlmarkupvisitor.h" #include "text.h" #include "tree.h" -#include "generator.h" #ifndef QT_NO_DECLARATIVE #include diff --git a/src/qdoc/jscodemarker.h b/src/qdoc/jscodemarker.h index 1b65d4da1..a66f5a54a 100644 --- a/src/qdoc/jscodemarker.h +++ b/src/qdoc/jscodemarker.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/location.cpp b/src/qdoc/location.cpp index d9a3ad609..ae972c233 100644 --- a/src/qdoc/location.cpp +++ b/src/qdoc/location.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,17 +26,19 @@ ** ****************************************************************************/ -#include -#include "config.h" #include "location.h" + +#include "config.h" #include "generator.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/location.h b/src/qdoc/location.h index 16188bde1..65f1b55b7 100644 --- a/src/qdoc/location.h +++ b/src/qdoc/location.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,8 +33,8 @@ #ifndef LOCATION_H #define LOCATION_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp index a4598dcb3..3e70778c4 100644 --- a/src/qdoc/main.cpp +++ b/src/qdoc/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,16 +26,6 @@ ** ****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "clangcodeparser.h" #include "codemarker.h" #include "codeparser.h" @@ -48,20 +38,31 @@ #include "location.h" #include "loggingcategory.h" #include "puredocparser.h" -#include "qmlcodemarker.h" -#include "qmlcodeparser.h" #include "qdoccommandlineparser.h" #include "qdocdatabase.h" #include "qdocglobals.h" +#include "qmlcodemarker.h" +#include "qmlcodeparser.h" #include "qtranslator.h" #include "tokenizer.h" #include "tree.h" #include "webxmlgenerator.h" +#include +#include +#include +#include +#include +#include +#include + #ifndef QT_BOOTSTRAPPED -# include "qcoreapplication.h" +# include #endif +#include +#include + QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcQdoc, "qt.qdoc") diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 0728ae9e6..c9c3390e8 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -27,15 +27,17 @@ ****************************************************************************/ #include "node.h" -#include "tree.h" + #include "codemarker.h" #include "cppcodeparser.h" -#include -#include "qdocdatabase.h" -#include #include "generator.h" -#include "tokenizer.h" #include "puredocparser.h" +#include "qdocdatabase.h" +#include "tokenizer.h" +#include "tree.h" + +#include +#include #include diff --git a/src/qdoc/node.h b/src/qdoc/node.h index 755f5efb4..583f4a5b7 100644 --- a/src/qdoc/node.h +++ b/src/qdoc/node.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,13 +29,14 @@ #ifndef NODE_H #define NODE_H -#include -#include -#include -#include -#include -#include "parameters.h" #include "doc.h" +#include "parameters.h" + +#include +#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/openedlist.cpp b/src/qdoc/openedlist.cpp index 79a0e8a63..59f7745a5 100644 --- a/src/qdoc/openedlist.cpp +++ b/src/qdoc/openedlist.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -30,10 +30,11 @@ openedlist.cpp */ -#include +#include "openedlist.h" #include "atom.h" -#include "openedlist.h" + +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/openedlist.h b/src/qdoc/openedlist.h index 77f134a9b..6d7b8e062 100644 --- a/src/qdoc/openedlist.h +++ b/src/qdoc/openedlist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,10 +33,10 @@ #ifndef OPENEDLIST_H #define OPENEDLIST_H -#include - #include "location.h" +#include + QT_BEGIN_NAMESPACE class OpenedList diff --git a/src/qdoc/parameters.cpp b/src/qdoc/parameters.cpp index 281232e39..1b37cca89 100644 --- a/src/qdoc/parameters.cpp +++ b/src/qdoc/parameters.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -27,9 +27,10 @@ ****************************************************************************/ #include "parameters.h" -#include "tokenizer.h" + #include "codechunk.h" #include "generator.h" +#include "tokenizer.h" QT_BEGIN_NAMESPACE diff --git a/src/qdoc/parameters.h b/src/qdoc/parameters.h index b83c579c2..db704426f 100644 --- a/src/qdoc/parameters.h +++ b/src/qdoc/parameters.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,9 +29,9 @@ #ifndef PARAMETERS_H #define PARAMETERS_H -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/puredocparser.cpp b/src/qdoc/puredocparser.cpp index 251c47185..fe20f4ac6 100644 --- a/src/qdoc/puredocparser.cpp +++ b/src/qdoc/puredocparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,11 +26,13 @@ ** ****************************************************************************/ -#include -#include "tokenizer.h" -#include "qdocdatabase.h" #include "puredocparser.h" +#include "qdocdatabase.h" +#include "tokenizer.h" + +#include + QT_BEGIN_NAMESPACE PureDocParser *PureDocParser::pureParser_ = nullptr; diff --git a/src/qdoc/qdoccommandlineparser.cpp b/src/qdoc/qdoccommandlineparser.cpp index 99003ff92..d5d809e4c 100644 --- a/src/qdoc/qdoccommandlineparser.cpp +++ b/src/qdoc/qdoccommandlineparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/qdoccommandlineparser.h b/src/qdoc/qdoccommandlineparser.h index 4f7b3fdac..a2e5d76a8 100644 --- a/src/qdoc/qdoccommandlineparser.h +++ b/src/qdoc/qdoccommandlineparser.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/qdocdatabase.cpp b/src/qdoc/qdocdatabase.cpp index 2cbc8fab9..5c4972530 100644 --- a/src/qdoc/qdocdatabase.cpp +++ b/src/qdoc/qdocdatabase.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,13 +26,15 @@ ** ****************************************************************************/ -#include "generator.h" -#include "atom.h" -#include "tree.h" #include "qdocdatabase.h" -#include "qdoctagfiles.h" + +#include "atom.h" +#include "generator.h" #include "qdocindexfiles.h" -#include +#include "qdoctagfiles.h" +#include "tree.h" + +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/qdocdatabase.h b/src/qdoc/qdocdatabase.h index d7db6b7e5..278b114b1 100644 --- a/src/qdoc/qdocdatabase.h +++ b/src/qdoc/qdocdatabase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,12 +29,13 @@ #ifndef QDOCDATABASE_H #define QDOCDATABASE_H -#include -#include -#include "tree.h" #include "config.h" #include "text.h" -#include +#include "tree.h" + +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp index b0a2c055f..b6700ba5b 100644 --- a/src/qdoc/qdocindexfiles.cpp +++ b/src/qdoc/qdocindexfiles.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,15 +26,17 @@ ** ****************************************************************************/ -#include "qxmlstream.h" #include "qdocindexfiles.h" -#include "qdoctagfiles.h" -#include "config.h" -#include "qdocdatabase.h" -#include "location.h" + #include "atom.h" +#include "config.h" #include "generator.h" -#include +#include "location.h" +#include "qdocdatabase.h" +#include "qdoctagfiles.h" + +#include +#include #include diff --git a/src/qdoc/qdocindexfiles.h b/src/qdoc/qdocindexfiles.h index d04e0a325..72f807f41 100644 --- a/src/qdoc/qdocindexfiles.h +++ b/src/qdoc/qdocindexfiles.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -39,6 +39,7 @@ class Generator; class QStringList; class QDocDatabase; class WebXMLGenerator; +class QXmlStreamReader; class QXmlStreamWriter; class QXmlStreamAttributes; diff --git a/src/qdoc/qdoctagfiles.cpp b/src/qdoc/qdoctagfiles.cpp index e04f684a3..718aa8768 100644 --- a/src/qdoc/qdoctagfiles.cpp +++ b/src/qdoc/qdoctagfiles.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,18 +26,19 @@ ** ****************************************************************************/ -#include "node.h" #include "qdoctagfiles.h" -#include "qdocdatabase.h" #include "atom.h" #include "doc.h" #include "htmlgenerator.h" #include "location.h" #include "node.h" +#include "qdocdatabase.h" #include "text.h" + +#include + #include -#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/qdoctagfiles.h b/src/qdoc/qdoctagfiles.h index 56d0b92f6..e1f4eccce 100644 --- a/src/qdoc/qdoctagfiles.h +++ b/src/qdoc/qdoctagfiles.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,7 +29,7 @@ #ifndef QDOCTAGFILES_H #define QDOCTAGFILES_H -#include "qxmlstream.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/qmlcodemarker.cpp b/src/qdoc/qmlcodemarker.cpp index ce074360b..5e9af282c 100644 --- a/src/qdoc/qmlcodemarker.cpp +++ b/src/qdoc/qmlcodemarker.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/qmlcodemarker.h b/src/qdoc/qmlcodemarker.h index c8469b78f..76df699b3 100644 --- a/src/qdoc/qmlcodemarker.h +++ b/src/qdoc/qmlcodemarker.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/qmlcodeparser.cpp b/src/qdoc/qmlcodeparser.cpp index 5539d5b80..61dc22ce6 100644 --- a/src/qdoc/qmlcodeparser.cpp +++ b/src/qdoc/qmlcodeparser.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/qmlcodeparser.h b/src/qdoc/qmlcodeparser.h index 5188867e4..163495591 100644 --- a/src/qdoc/qmlcodeparser.h +++ b/src/qdoc/qmlcodeparser.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -35,7 +35,8 @@ #include "codeparser.h" -#include +#include + #ifndef QT_NO_DECLARATIVE #include #include diff --git a/src/qdoc/qmlmarkupvisitor.cpp b/src/qdoc/qmlmarkupvisitor.cpp index 6d0f2470b..9613b997e 100644 --- a/src/qdoc/qmlmarkupvisitor.cpp +++ b/src/qdoc/qmlmarkupvisitor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -28,8 +28,9 @@ #include "qmlmarkupvisitor.h" -#include -#include +#include +#include + #ifndef QT_NO_DECLARATIVE #include #include diff --git a/src/qdoc/qmlmarkupvisitor.h b/src/qdoc/qmlmarkupvisitor.h index c752f7264..1f48722b1 100644 --- a/src/qdoc/qmlmarkupvisitor.h +++ b/src/qdoc/qmlmarkupvisitor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -32,7 +32,8 @@ #include "node.h" #include "tree.h" -#include +#include + #ifndef QT_NO_DECLARATIVE #include #include diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp index 042ff67e3..7f36fdb2e 100644 --- a/src/qdoc/qmlvisitor.cpp +++ b/src/qdoc/qmlvisitor.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -28,16 +28,17 @@ #include "qmlvisitor.h" -#include "node.h" +#include "codechunk.h" #include "codeparser.h" +#include "node.h" #include "qdocdatabase.h" #include "tokenizer.h" -#include "codechunk.h" -#include -#include -#include -#include +#include +#include +#include +#include + #ifndef QT_NO_DECLARATIVE #include #include diff --git a/src/qdoc/qmlvisitor.h b/src/qdoc/qmlvisitor.h index 4d32a6bd5..50250d222 100644 --- a/src/qdoc/qmlvisitor.h +++ b/src/qdoc/qmlvisitor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -31,7 +31,8 @@ #include "node.h" -#include +#include + #ifndef QT_NO_DECLARATIVE #include #include diff --git a/src/qdoc/quoter.cpp b/src/qdoc/quoter.cpp index 408b1b5b0..0e006d49f 100644 --- a/src/qdoc/quoter.cpp +++ b/src/qdoc/quoter.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,12 +26,12 @@ ** ****************************************************************************/ -#include -#include -#include - #include "quoter.h" +#include +#include +#include + QT_BEGIN_NAMESPACE QHash Quoter::commentHash; diff --git a/src/qdoc/quoter.h b/src/qdoc/quoter.h index a22f7ddec..d48376b2c 100644 --- a/src/qdoc/quoter.h +++ b/src/qdoc/quoter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,11 +33,11 @@ #ifndef QUOTER_H #define QUOTER_H -#include -#include - #include "location.h" +#include +#include + QT_BEGIN_NAMESPACE class Quoter diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp index 20d8c70b0..978e856f2 100644 --- a/src/qdoc/sections.cpp +++ b/src/qdoc/sections.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,11 +26,14 @@ ** ****************************************************************************/ -#include -#include "generator.h" #include "sections.h" + #include "config.h" -#include +#include "generator.h" + +#include +#include + #include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/sections.h b/src/qdoc/sections.h index ef7441b35..704691c41 100644 --- a/src/qdoc/sections.h +++ b/src/qdoc/sections.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,9 +29,10 @@ #ifndef SECTIONS_H #define SECTIONS_H -#include #include "node.h" +#include + QT_BEGIN_NAMESPACE typedef QMultiMap MemberMap; // the string is the member signature diff --git a/src/qdoc/separator.cpp b/src/qdoc/separator.cpp index 3cf305188..80dc39559 100644 --- a/src/qdoc/separator.cpp +++ b/src/qdoc/separator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -31,7 +31,8 @@ */ #include "separator.h" -#include + +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/separator.h b/src/qdoc/separator.h index a8637ddd7..ae4d58f7a 100644 --- a/src/qdoc/separator.h +++ b/src/qdoc/separator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,7 +33,7 @@ #ifndef SEPARATOR_H #define SEPARATOR_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/text.cpp b/src/qdoc/text.cpp index 0560d45eb..6fc57106e 100644 --- a/src/qdoc/text.cpp +++ b/src/qdoc/text.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -30,8 +30,10 @@ text.cpp */ -#include #include "text.h" + +#include + #include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/text.h b/src/qdoc/text.h index d72d38469..d0639ae4c 100644 --- a/src/qdoc/text.h +++ b/src/qdoc/text.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. diff --git a/src/qdoc/tokenizer.cpp b/src/qdoc/tokenizer.cpp index d36e7bb18..6c3d6b3d6 100644 --- a/src/qdoc/tokenizer.cpp +++ b/src/qdoc/tokenizer.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,15 +26,16 @@ ** ****************************************************************************/ -#include "config.h" #include "tokenizer.h" + +#include "config.h" #include "generator.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/qdoc/tokenizer.h b/src/qdoc/tokenizer.h index 4ef3195ed..2750bf9b8 100644 --- a/src/qdoc/tokenizer.h +++ b/src/qdoc/tokenizer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,12 +33,12 @@ #ifndef TOKENIZER_H #define TOKENIZER_H -#include -#include -#include - #include "location.h" +#include +#include +#include + QT_BEGIN_NAMESPACE /* diff --git a/src/qdoc/tree.cpp b/src/qdoc/tree.cpp index 373080163..5fab833ca 100644 --- a/src/qdoc/tree.cpp +++ b/src/qdoc/tree.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -26,15 +26,18 @@ ** ****************************************************************************/ +#include "tree.h" + #include "doc.h" #include "htmlgenerator.h" #include "location.h" #include "node.h" -#include "text.h" -#include "tree.h" #include "qdocdatabase.h" +#include "text.h" + +#include + #include -#include QT_BEGIN_NAMESPACE diff --git a/src/qdoc/tree.h b/src/qdoc/tree.h index a70d0f5d2..865ee2266 100644 --- a/src/qdoc/tree.h +++ b/src/qdoc/tree.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -33,9 +33,10 @@ #ifndef TREE_H #define TREE_H -#include #include "node.h" +#include + QT_BEGIN_NAMESPACE class QStringList; diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp index 45178c3c1..97eab1ed0 100644 --- a/src/qdoc/webxmlgenerator.cpp +++ b/src/qdoc/webxmlgenerator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -27,11 +27,12 @@ ****************************************************************************/ #include "webxmlgenerator.h" + +#include "helpprojectwriter.h" #include "node.h" +#include "qdocdatabase.h" #include "separator.h" #include "tree.h" -#include "qdocdatabase.h" -#include "helpprojectwriter.h" #include diff --git a/src/qdoc/webxmlgenerator.h b/src/qdoc/webxmlgenerator.h index f243a5402..2cfd81b8e 100644 --- a/src/qdoc/webxmlgenerator.h +++ b/src/qdoc/webxmlgenerator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -29,13 +29,13 @@ #ifndef WEBXMLGENERATOR_H #define WEBXMLGENERATOR_H -#include - #include "codemarker.h" #include "config.h" #include "htmlgenerator.h" #include "qdocindexfiles.h" +#include + QT_BEGIN_NAMESPACE class WebXMLGenerator : public HtmlGenerator, public IndexSectionWriter diff --git a/src/qdoc/yyindent.cpp b/src/qdoc/yyindent.cpp index 0f6ea4494..f27402483 100644 --- a/src/qdoc/yyindent.cpp +++ b/src/qdoc/yyindent.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -65,8 +65,8 @@ as comments and string literals are removed beforehand. */ -#include -#include +#include +#include QT_BEGIN_NAMESPACE -- cgit v1.2.3