From 00c414f562159d8fbc832d8807aa215800f201b4 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Fri, 26 Mar 2021 20:01:51 +0100 Subject: Refactoring: make qcstring.h a local include --- src/arguments.h | 2 +- src/bufstr.h | 2 +- src/cite.h | 2 +- src/cmdmapper.h | 2 +- src/commentscan.l | 3 +-- src/condparser.h | 6 +++--- src/configgen.py | 2 +- src/configimpl.h | 2 +- src/configimpl.l | 1 - src/declinfo.h | 8 ++++---- src/define.h | 2 +- src/dirdef.h | 7 ++++--- src/docbookvisitor.h | 6 +++--- src/docparser.cpp | 2 +- src/docparser.h | 3 +-- src/doctokenizer.h | 3 ++- src/dot.h | 2 +- src/dotgraph.h | 2 +- src/example.h | 2 +- src/formula.h | 3 ++- src/htmlattrib.h | 3 ++- src/htmldocvisitor.h | 2 +- src/index.h | 2 +- src/latexdocvisitor.h | 2 +- src/mandocvisitor.h | 5 +++-- src/markdown.h | 2 +- src/plantuml.h | 3 ++- src/pre.l | 3 +-- src/reflist.h | 2 +- src/resourcemgr.cpp | 1 - src/resourcemgr.h | 2 +- src/rtfdocvisitor.h | 2 +- src/rtfstyle.h | 3 ++- src/scopedtypevariant.h | 3 ++- src/searchindex.h | 2 +- src/section.h | 3 +-- src/symbolresolver.h | 1 + src/template.h | 3 ++- src/textdocvisitor.h | 2 +- src/types.h | 2 +- src/vhdldocgen.cpp | 4 ++-- src/vhdldocgen.h | 4 ++-- src/vhdljjparser.cpp | 2 +- src/xmldocvisitor.h | 5 +++-- 44 files changed, 65 insertions(+), 60 deletions(-) diff --git a/src/arguments.h b/src/arguments.h index 181a8d3..56dd7af 100644 --- a/src/arguments.h +++ b/src/arguments.h @@ -17,7 +17,7 @@ #define ARGUMENTS_H #include -#include +#include "qcstring.h" /*! \brief This class contains the information about the argument of a * function or template diff --git a/src/bufstr.h b/src/bufstr.h index fcdce6b..323f4bc 100644 --- a/src/bufstr.h +++ b/src/bufstr.h @@ -19,7 +19,7 @@ #define _BUFSTR_H #include -#include +#include "qcstring.h" /*! @brief Buffer used to store strings * diff --git a/src/cite.h b/src/cite.h index 5d8a837..20783e4 100644 --- a/src/cite.h +++ b/src/cite.h @@ -19,7 +19,7 @@ #include -#include +#include "qcstring.h" /// Citation-related data. struct CiteInfo diff --git a/src/cmdmapper.h b/src/cmdmapper.h index 8cbf017..1675e76 100644 --- a/src/cmdmapper.h +++ b/src/cmdmapper.h @@ -18,7 +18,7 @@ #include #include -#include +#include "qcstring.h" struct CommandMap; diff --git a/src/commentscan.l b/src/commentscan.l index 8fa2199..de359b6 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -37,8 +37,7 @@ #include #include -#include - +#include "qcstring.h" #include "cite.h" #include "commentscan.h" #include "condparser.h" diff --git a/src/condparser.h b/src/condparser.h index 1ad13b1..692793c 100644 --- a/src/condparser.h +++ b/src/condparser.h @@ -5,8 +5,8 @@ * Copyright (C) 1997-2015 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its - * documentation under the terms of the GNU General Public License is hereby - * granted. No representations are made about the suitability of this software + * documentation under the terms of the GNU General Public License is hereby + * granted. No representations are made about the suitability of this software * for any purpose. It is provided "as is" without express or implied warranty. * See the GNU General Public License for more details. * @@ -22,7 +22,7 @@ * ! NOT operator */ -#include +#include "qcstring.h" class CondParser { diff --git a/src/configgen.py b/src/configgen.py index 1dcf3b5..0d18e84 100755 --- a/src/configgen.py +++ b/src/configgen.py @@ -683,7 +683,7 @@ def main(): print("#ifndef CONFIGVALUES_H") print("#define CONFIGVALUES_H") print("") - print("#include ") + print("#include \"qcstring.h\"") print("#include \"containers.h\"") print("#include \"settings.h\"") print("") diff --git a/src/configimpl.h b/src/configimpl.h index 3d91b2d..2a124f8 100644 --- a/src/configimpl.h +++ b/src/configimpl.h @@ -26,7 +26,7 @@ #include #include "containers.h" -#include +#include "qcstring.h" /** Abstract base class for any configuration option. diff --git a/src/configimpl.l b/src/configimpl.l index a4c6c5d..6f22061 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -36,7 +36,6 @@ #include "version.h" #include "portable.h" #include "message.h" - #include "lang_cfg.h" #include "configoptions.h" #include "fileinfo.h" diff --git a/src/declinfo.h b/src/declinfo.h index 2039dca..002fe8e 100644 --- a/src/declinfo.h +++ b/src/declinfo.h @@ -1,12 +1,12 @@ /****************************************************************************** * - * + * * * Copyright (C) 1997-2015 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its - * documentation under the terms of the GNU General Public License is hereby - * granted. No representations are made about the suitability of this software + * documentation under the terms of the GNU General Public License is hereby + * granted. No representations are made about the suitability of this software * for any purpose. It is provided "as is" without express or implied warranty. * See the GNU General Public License for more details. * @@ -19,7 +19,7 @@ #define DECLINFO_H #include -#include +#include "qcstring.h" #include "types.h" extern void parseFuncDecl(const QCString &decl, diff --git a/src/define.h b/src/define.h index 23da59d..6cbb636 100644 --- a/src/define.h +++ b/src/define.h @@ -21,7 +21,7 @@ #include #include -#include +#include "qcstring.h" #include "containers.h" class FileDef; diff --git a/src/dirdef.h b/src/dirdef.h index 5414ddf..c7b2f9a 100644 --- a/src/dirdef.h +++ b/src/dirdef.h @@ -16,12 +16,13 @@ #ifndef DIRDEF_H #define DIRDEF_H -#include "linkedmap.h" -#include "definition.h" #include #include -#include + +#include "qcstring.h" +#include "linkedmap.h" +#include "definition.h" class FileList; class FileDef; diff --git a/src/docbookvisitor.h b/src/docbookvisitor.h index f1be60a..f1e6c88 100644 --- a/src/docbookvisitor.h +++ b/src/docbookvisitor.h @@ -16,12 +16,12 @@ #ifndef _DOCBOOKDOCVISITOR_H #define _DOCBOOKDOCVISITOR_H +#include + #include "containers.h" #include "docvisitor.h" #include "docparser.h" - -#include -#include +#include "qcstring.h" class CodeOutputInterface; class QCString; diff --git a/src/docparser.cpp b/src/docparser.cpp index b1cce37..a1f982c 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -17,9 +17,9 @@ #include #include -#include #include +#include "qcstring.h" #include "regex.h" #include "doxygen.h" #include "debug.h" diff --git a/src/docparser.h b/src/docparser.h index 22eac8f..a510b32 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -23,8 +23,7 @@ #include #include -#include - +#include "qcstring.h" #include "docvisitor.h" #include "htmlattrib.h" diff --git a/src/doctokenizer.h b/src/doctokenizer.h index ec73e61..80d757f 100644 --- a/src/doctokenizer.h +++ b/src/doctokenizer.h @@ -19,9 +19,10 @@ #ifndef _DOCTOKENIZER_H #define _DOCTOKENIZER_H -#include #include + #include "htmlattrib.h" +#include "qcstring.h" class Definition; diff --git a/src/dot.h b/src/dot.h index 65453b1..4b908ff 100644 --- a/src/dot.h +++ b/src/dot.h @@ -16,9 +16,9 @@ #ifndef DOT_H #define DOT_H -#include #include +#include "qcstring.h" #include "dotgraph.h" // only for GraphOutputFormat #include "dotfilepatcher.h" #include "dotrunner.h" diff --git a/src/dotgraph.h b/src/dotgraph.h index a0b6136..176d776 100644 --- a/src/dotgraph.h +++ b/src/dotgraph.h @@ -18,7 +18,7 @@ #include -#include +#include "qcstring.h" #include "dir.h" class DotNode; diff --git a/src/example.h b/src/example.h index 7929c24..190b894 100644 --- a/src/example.h +++ b/src/example.h @@ -19,7 +19,7 @@ #include #include -#include +#include "qcstring.h" class ClassDef; class MemberName; diff --git a/src/formula.h b/src/formula.h index 686cea2..39fabdd 100644 --- a/src/formula.h +++ b/src/formula.h @@ -20,7 +20,8 @@ #include #include -#include + +#include "qcstring.h" /*! Manager class to handle formulas */ class FormulaManager diff --git a/src/htmlattrib.h b/src/htmlattrib.h index 0a7673f..9e22520 100644 --- a/src/htmlattrib.h +++ b/src/htmlattrib.h @@ -16,7 +16,8 @@ #define _HTMLATTRIB_H #include -#include + +#include "qcstring.h" /*! \brief Class representing a HTML attribute. */ struct HtmlAttrib diff --git a/src/htmldocvisitor.h b/src/htmldocvisitor.h index 44e1597..3e157d2 100644 --- a/src/htmldocvisitor.h +++ b/src/htmldocvisitor.h @@ -17,7 +17,7 @@ #define _HTMLDOCVISITOR_H #include "docvisitor.h" -#include +#include "qcstring.h" class Definition; class MemberDef; diff --git a/src/index.h b/src/index.h index 042d3ee..8b090dc 100644 --- a/src/index.h +++ b/src/index.h @@ -20,7 +20,7 @@ #include #include -#include +#include "qcstring.h" class Definition; class DefinitionMutable; diff --git a/src/latexdocvisitor.h b/src/latexdocvisitor.h index 2e2faa6..5e590eb 100644 --- a/src/latexdocvisitor.h +++ b/src/latexdocvisitor.h @@ -18,8 +18,8 @@ #include +#include "qcstring.h" #include "docvisitor.h" -#include class LatexCodeGenerator; diff --git a/src/mandocvisitor.h b/src/mandocvisitor.h index 61f7ee8..c994f08 100644 --- a/src/mandocvisitor.h +++ b/src/mandocvisitor.h @@ -19,10 +19,11 @@ #ifndef _MANDOCVISITOR_H #define _MANDOCVISITOR_H -#include "docvisitor.h" -#include #include +#include "qcstring.h" +#include "docvisitor.h" + class CodeOutputInterface; /*! @brief Concrete visitor implementation for LaTeX output. */ diff --git a/src/markdown.h b/src/markdown.h index dd4ff73..6744149 100644 --- a/src/markdown.h +++ b/src/markdown.h @@ -18,7 +18,7 @@ #include -#include +#include "qcstring.h" #include "parserintf.h" #include "growbuf.h" diff --git a/src/plantuml.h b/src/plantuml.h index b553fa8..b92cd0c 100644 --- a/src/plantuml.h +++ b/src/plantuml.h @@ -18,8 +18,9 @@ #include #include + #include "containers.h" -#include +#include "qcstring.h" #define CACHE_FILENAME "inline_umlgraph_cache_all.pu" #define DIVIDE_COUNT 4 diff --git a/src/pre.l b/src/pre.l index b3758bc..a288d95 100644 --- a/src/pre.l +++ b/src/pre.l @@ -41,8 +41,7 @@ #include #include -#include - +#include "qcstring.h" #include "containers.h" #include "pre.h" #include "constexp.h" diff --git a/src/reflist.h b/src/reflist.h index 7f4473c..f6444c5 100644 --- a/src/reflist.h +++ b/src/reflist.h @@ -20,7 +20,7 @@ #include #include -#include +#include "qcstring.h" #include "linkedmap.h" class Definition; diff --git a/src/resourcemgr.cpp b/src/resourcemgr.cpp index 86d779b..01494d8 100644 --- a/src/resourcemgr.cpp +++ b/src/resourcemgr.cpp @@ -14,7 +14,6 @@ */ #include -#include #include #include diff --git a/src/resourcemgr.h b/src/resourcemgr.h index 2d7ad9b..851f8b0 100644 --- a/src/resourcemgr.h +++ b/src/resourcemgr.h @@ -18,7 +18,7 @@ #include #include -#include +#include "qcstring.h" /** @brief Compiled resource */ struct Resource diff --git a/src/rtfdocvisitor.h b/src/rtfdocvisitor.h index cbe4eb0..290746a 100644 --- a/src/rtfdocvisitor.h +++ b/src/rtfdocvisitor.h @@ -22,7 +22,7 @@ #include #include "docvisitor.h" -#include +#include "qcstring.h" class CodeOutputInterface; diff --git a/src/rtfstyle.h b/src/rtfstyle.h index 140d31f..903f34f 100644 --- a/src/rtfstyle.h +++ b/src/rtfstyle.h @@ -18,7 +18,8 @@ #include #include -#include + +#include "qcstring.h" // used for table column width calculation const int rtf_pageWidth = 8748; diff --git a/src/scopedtypevariant.h b/src/scopedtypevariant.h index d544434..16de7f6 100644 --- a/src/scopedtypevariant.h +++ b/src/scopedtypevariant.h @@ -18,7 +18,8 @@ #include #include -#include + +#include "qcstring.h" #include "definition.h" //! Class representing a local class definition found while diff --git a/src/searchindex.h b/src/searchindex.h index 9039f00..ee56b08 100644 --- a/src/searchindex.h +++ b/src/searchindex.h @@ -24,7 +24,7 @@ #include #include -#include +#include "qcstring.h" class Definition; diff --git a/src/section.h b/src/section.h index 74eb04b..562f54a 100644 --- a/src/section.h +++ b/src/section.h @@ -19,8 +19,7 @@ #include #include -#include - +#include "qcstring.h" #include "linkedmap.h" class Definition; diff --git a/src/symbolresolver.h b/src/symbolresolver.h index 5536c1e..6122e82 100644 --- a/src/symbolresolver.h +++ b/src/symbolresolver.h @@ -17,6 +17,7 @@ #define SYMBOLRESOLVER_H #include + #include "qcstring.h" #include "classdef.h" diff --git a/src/template.h b/src/template.h index d611ec3..875a039 100644 --- a/src/template.h +++ b/src/template.h @@ -16,10 +16,11 @@ #ifndef TEMPLATE_H #define TEMPLATE_H -#include #include #include +#include "qcstring.h" + class TemplateListIntf; class TemplateStructIntf; class TemplateEngine; diff --git a/src/textdocvisitor.h b/src/textdocvisitor.h index 1fa92cc..6a4e08c 100644 --- a/src/textdocvisitor.h +++ b/src/textdocvisitor.h @@ -19,9 +19,9 @@ #ifndef _TEXTDOCVISITOR_H #define _TEXTDOCVISITOR_H +#include "qcstring.h" #include "docvisitor.h" #include "docparser.h" -#include /*! @brief Concrete visitor implementation for TEXT output. */ class TextDocVisitor : public DocVisitor diff --git a/src/types.h b/src/types.h index 0038011..b629501 100644 --- a/src/types.h +++ b/src/types.h @@ -16,7 +16,7 @@ #ifndef TYPES_H #define TYPES_H -#include +#include "qcstring.h" /** @file * @brief This file contains a number of basic enums and types. diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index f8d2cc3..7d3e000 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -27,11 +27,11 @@ #include #include -#include /* --------------------------------------------------------------- */ // local includes +#include "qcstring.h" #include "vhdldocgen.h" #include "message.h" #include "config.h" @@ -2035,7 +2035,7 @@ void VhdlDocGen::writeVHDLDeclaration(const MemberDefMutable* mdef,OutputList &o void VhdlDocGen::writePlainVHDLDeclarations( const MemberList* mlist,OutputList &ol, - const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,int specifier) + const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,uint64_t specifier) { StringSet pack; diff --git a/src/vhdldocgen.h b/src/vhdldocgen.h index 04a8489..aa3313e 100644 --- a/src/vhdldocgen.h +++ b/src/vhdldocgen.h @@ -21,7 +21,7 @@ * vhdl documents */ -#include +#include "qcstring.h" #include "layout.h" #include "arguments.h" #include "entry.h" @@ -193,7 +193,7 @@ class VhdlDocGen static void writePlainVHDLDeclarations(const MemberList* ml,OutputList &ol, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd, - int specifier); + uint64_t specifier); static void writeVHDLDeclarations(const MemberList* ml,OutputList &ol, const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd, diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp index 4f68728..f060c30 100644 --- a/src/vhdljjparser.cpp +++ b/src/vhdljjparser.cpp @@ -12,7 +12,7 @@ #include -#include +#include "qcstring.h" #include "containers.h" #include "vhdljjparser.h" #include "vhdldocgen.h" diff --git a/src/xmldocvisitor.h b/src/xmldocvisitor.h index 66d0dd4..0309a5e 100644 --- a/src/xmldocvisitor.h +++ b/src/xmldocvisitor.h @@ -19,10 +19,11 @@ #ifndef _XMLDOCVISITOR_H #define _XMLDOCVISITOR_H -#include "docvisitor.h" -#include #include +#include "qcstring.h" +#include "docvisitor.h" + class CodeOutputInterface; class QCString; -- cgit v0.12