Skip to content

Commit 00c414f

Browse files
committed
Refactoring: make qcstring.h a local include
1 parent 310df91 commit 00c414f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+65
-60
lines changed

src/arguments.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define ARGUMENTS_H
1818

1919
#include <vector>
20-
#include <qcstring.h>
20+
#include "qcstring.h"
2121

2222
/*! \brief This class contains the information about the argument of a
2323
* function or template

src/bufstr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define _BUFSTR_H
2020

2121
#include <cstdlib>
22-
#include <qcstring.h>
22+
#include "qcstring.h"
2323

2424
/*! @brief Buffer used to store strings
2525
*

src/cite.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <memory>
2121

22-
#include <qcstring.h>
22+
#include "qcstring.h"
2323

2424
/// Citation-related data.
2525
struct CiteInfo

src/cmdmapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <map>
2020
#include <string>
21-
#include <qcstring.h>
21+
#include "qcstring.h"
2222

2323
struct CommandMap;
2424

src/commentscan.l

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
#include <assert.h>
3838
#include <ctype.h>
3939

40-
#include <qcstring.h>
41-
40+
#include "qcstring.h"
4241
#include "cite.h"
4342
#include "commentscan.h"
4443
#include "condparser.h"

src/condparser.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* Copyright (C) 1997-2015 by Dimitri van Heesch.
66
*
77
* Permission to use, copy, modify, and distribute this software and its
8-
* documentation under the terms of the GNU General Public License is hereby
9-
* granted. No representations are made about the suitability of this software
8+
* documentation under the terms of the GNU General Public License is hereby
9+
* granted. No representations are made about the suitability of this software
1010
* for any purpose. It is provided "as is" without express or implied warranty.
1111
* See the GNU General Public License for more details.
1212
*
@@ -22,7 +22,7 @@
2222
* ! NOT operator
2323
*/
2424

25-
#include <qcstring.h>
25+
#include "qcstring.h"
2626

2727
class CondParser
2828
{

src/configgen.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ def main():
683683
print("#ifndef CONFIGVALUES_H")
684684
print("#define CONFIGVALUES_H")
685685
print("")
686-
print("#include <qcstring.h>")
686+
print("#include \"qcstring.h\"")
687687
print("#include \"containers.h\"")
688688
print("#include \"settings.h\"")
689689
print("")

src/configimpl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <iostream>
2727

2828
#include "containers.h"
29-
#include <qcstring.h>
29+
#include "qcstring.h"
3030

3131

3232
/** Abstract base class for any configuration option.

src/configimpl.l

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "version.h"
3737
#include "portable.h"
3838
#include "message.h"
39-
4039
#include "lang_cfg.h"
4140
#include "configoptions.h"
4241
#include "fileinfo.h"

src/declinfo.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/******************************************************************************
22
*
3-
*
3+
*
44
*
55
* Copyright (C) 1997-2015 by Dimitri van Heesch.
66
*
77
* Permission to use, copy, modify, and distribute this software and its
8-
* documentation under the terms of the GNU General Public License is hereby
9-
* granted. No representations are made about the suitability of this software
8+
* documentation under the terms of the GNU General Public License is hereby
9+
* granted. No representations are made about the suitability of this software
1010
* for any purpose. It is provided "as is" without express or implied warranty.
1111
* See the GNU General Public License for more details.
1212
*
@@ -19,7 +19,7 @@
1919
#define DECLINFO_H
2020

2121
#include <stdio.h>
22-
#include <qcstring.h>
22+
#include "qcstring.h"
2323
#include "types.h"
2424

2525
extern void parseFuncDecl(const QCString &decl,

src/define.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <string>
2222
#include <unordered_map>
2323

24-
#include <qcstring.h>
24+
#include "qcstring.h"
2525
#include "containers.h"
2626

2727
class FileDef;

src/dirdef.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
#ifndef DIRDEF_H
1717
#define DIRDEF_H
1818

19-
#include "linkedmap.h"
20-
#include "definition.h"
2119

2220
#include <vector>
2321
#include <map>
24-
#include <qcstring.h>
22+
23+
#include "qcstring.h"
24+
#include "linkedmap.h"
25+
#include "definition.h"
2526

2627
class FileList;
2728
class FileDef;

src/docbookvisitor.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#ifndef _DOCBOOKDOCVISITOR_H
1717
#define _DOCBOOKDOCVISITOR_H
1818

19+
#include <iostream>
20+
1921
#include "containers.h"
2022
#include "docvisitor.h"
2123
#include "docparser.h"
22-
23-
#include <qcstring.h>
24-
#include <iostream>
24+
#include "qcstring.h"
2525

2626
class CodeOutputInterface;
2727
class QCString;

src/docparser.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <stdlib.h>
1818
#include <cassert>
1919

20-
#include <qcstring.h>
2120
#include <ctype.h>
2221

22+
#include "qcstring.h"
2323
#include "regex.h"
2424
#include "doxygen.h"
2525
#include "debug.h"

src/docparser.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
#include <vector>
2424
#include <memory>
2525

26-
#include <qcstring.h>
27-
26+
#include "qcstring.h"
2827
#include "docvisitor.h"
2928
#include "htmlattrib.h"
3029

src/doctokenizer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
#ifndef _DOCTOKENIZER_H
2020
#define _DOCTOKENIZER_H
2121

22-
#include <qcstring.h>
2322
#include <stdio.h>
23+
2424
#include "htmlattrib.h"
25+
#include "qcstring.h"
2526

2627
class Definition;
2728

src/dot.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#ifndef DOT_H
1717
#define DOT_H
1818

19-
#include <qcstring.h>
2019
#include <map>
2120

21+
#include "qcstring.h"
2222
#include "dotgraph.h" // only for GraphOutputFormat
2323
#include "dotfilepatcher.h"
2424
#include "dotrunner.h"

src/dotgraph.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <iostream>
2020

21-
#include <qcstring.h>
21+
#include "qcstring.h"
2222
#include "dir.h"
2323

2424
class DotNode;

src/example.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <algorithm>
2020
#include <vector>
2121

22-
#include <qcstring.h>
22+
#include "qcstring.h"
2323

2424
class ClassDef;
2525
class MemberName;

src/formula.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
#include <memory>
2222
#include <string>
23-
#include <qcstring.h>
23+
24+
#include "qcstring.h"
2425

2526
/*! Manager class to handle formulas */
2627
class FormulaManager

src/htmlattrib.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
#define _HTMLATTRIB_H
1717

1818
#include <vector>
19-
#include <qcstring.h>
19+
20+
#include "qcstring.h"
2021

2122
/*! \brief Class representing a HTML attribute. */
2223
struct HtmlAttrib

src/htmldocvisitor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define _HTMLDOCVISITOR_H
1818

1919
#include "docvisitor.h"
20-
#include <qcstring.h>
20+
#include "qcstring.h"
2121

2222
class Definition;
2323
class MemberDef;

src/index.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <vector>
2121
#include <memory>
2222

23-
#include <qcstring.h>
23+
#include "qcstring.h"
2424

2525
class Definition;
2626
class DefinitionMutable;

src/latexdocvisitor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include <stack>
2020

21+
#include "qcstring.h"
2122
#include "docvisitor.h"
22-
#include <qcstring.h>
2323

2424
class LatexCodeGenerator;
2525

src/mandocvisitor.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
#ifndef _MANDOCVISITOR_H
2020
#define _MANDOCVISITOR_H
2121

22-
#include "docvisitor.h"
23-
#include <qcstring.h>
2422
#include <iostream>
2523

24+
#include "qcstring.h"
25+
#include "docvisitor.h"
26+
2627
class CodeOutputInterface;
2728

2829
/*! @brief Concrete visitor implementation for LaTeX output. */

src/markdown.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <functional>
2020

21-
#include <qcstring.h>
21+
#include "qcstring.h"
2222
#include "parserintf.h"
2323
#include "growbuf.h"
2424

src/plantuml.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818

1919
#include <map>
2020
#include <string>
21+
2122
#include "containers.h"
22-
#include <qcstring.h>
23+
#include "qcstring.h"
2324

2425
#define CACHE_FILENAME "inline_umlgraph_cache_all.pu"
2526
#define DIVIDE_COUNT 4

src/pre.l

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
#include <ctype.h>
4242
#include <errno.h>
4343

44-
#include <qcstring.h>
45-
44+
#include "qcstring.h"
4645
#include "containers.h"
4746
#include "pre.h"
4847
#include "constexp.h"

src/reflist.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <unordered_map>
2121
#include <memory>
2222

23-
#include <qcstring.h>
23+
#include "qcstring.h"
2424
#include "linkedmap.h"
2525

2626
class Definition;

src/resourcemgr.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
*/
1515

1616
#include <map>
17-
#include <qcstring.h>
1817
#include <string.h>
1918
#include <fstream>
2019

src/resourcemgr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <memory>
1919
#include <initializer_list>
2020

21-
#include <qcstring.h>
21+
#include "qcstring.h"
2222

2323
/** @brief Compiled resource */
2424
struct Resource

src/rtfdocvisitor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <iostream>
2323

2424
#include "docvisitor.h"
25-
#include <qcstring.h>
25+
#include "qcstring.h"
2626

2727
class CodeOutputInterface;
2828

src/rtfstyle.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
#include <map>
2020
#include <string>
21-
#include <qcstring.h>
21+
22+
#include "qcstring.h"
2223

2324
// used for table column width calculation
2425
const int rtf_pageWidth = 8748;

src/scopedtypevariant.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
#include <utility>
2020
#include <vector>
21-
#include <qcstring.h>
21+
22+
#include "qcstring.h"
2223
#include "definition.h"
2324

2425
//! Class representing a local class definition found while

src/searchindex.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <array>
2525
#include <functional>
2626

27-
#include <qcstring.h>
27+
#include "qcstring.h"
2828

2929
class Definition;
3030

src/section.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
#include <string>
2020
#include <unordered_map>
2121

22-
#include <qcstring.h>
23-
22+
#include "qcstring.h"
2423
#include "linkedmap.h"
2524

2625
class Definition;

src/symbolresolver.h

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#define SYMBOLRESOLVER_H
1818

1919
#include <memory>
20+
2021
#include "qcstring.h"
2122
#include "classdef.h"
2223

0 commit comments

Comments
 (0)