diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-07-30 15:49:11 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-08-03 07:12:17 +0200 |
| commit | c83bf647fb84f0bee5cc9894dd0c58f661194932 (patch) | |
| tree | 6e7c1d6c401d4cf1b93e78f4ef446ecd3f07c1c8 /src/qdoc/main.cpp | |
| parent | a9416f9cb747632a73e7901b48aa89ad250c69fe (diff) | |
| download | qttools-c83bf647fb84f0bee5cc9894dd0c58f661194932.tar.gz | |
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. <QtCore/qstring.h>
- 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 <edward.welbourne@qt.io>
Diffstat (limited to 'src/qdoc/main.cpp')
| -rw-r--r-- | src/qdoc/main.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
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 <algorithm> -#include <stdlib.h> -#include <QtCore/qcommandlineoption.h> -#include <QtCore/qcommandlineparser.h> -#include <QtCore/qdatetime.h> -#include <QtCore/qdebug.h> -#include <QtCore/qglobal.h> -#include <QtCore/qglobalstatic.h> -#include <QtCore/qhashfunctions.h> - #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 <QtCore/qcommandlineoption.h> +#include <QtCore/qcommandlineparser.h> +#include <QtCore/qdatetime.h> +#include <QtCore/qdebug.h> +#include <QtCore/qglobal.h> +#include <QtCore/qglobalstatic.h> +#include <QtCore/qhashfunctions.h> + #ifndef QT_BOOTSTRAPPED -# include "qcoreapplication.h" +# include <QtCore/qcoreapplication.h> #endif +#include <algorithm> +#include <stdlib.h> + QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcQdoc, "qt.qdoc") |