Skip to content

Commit 6397e29

Browse files
authored
cleaned up includes based on include-what-you-use (cppcheck-opensource#3141)
1 parent d11f0f3 commit 6397e29

106 files changed

Lines changed: 104 additions & 197 deletions

File tree

Some content is hidden

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

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ $(libcppdir)/preprocessor.o: lib/preprocessor.cpp externals/simplecpp/simplecpp.
541541
$(libcppdir)/programmemory.o: lib/programmemory.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/programmemory.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h
542542
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/programmemory.o $(libcppdir)/programmemory.cpp
543543

544-
$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/reverseanalyzer.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h
544+
$(libcppdir)/reverseanalyzer.o: lib/reverseanalyzer.cpp lib/analyzer.h lib/astutils.h lib/config.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/reverseanalyzer.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/valueptr.h
545545
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o $(libcppdir)/reverseanalyzer.o $(libcppdir)/reverseanalyzer.cpp
546546

547547
$(libcppdir)/settings.o: lib/settings.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/summaries.h lib/suppressions.h lib/timer.h lib/utils.h lib/valueflow.h
@@ -625,7 +625,7 @@ test/testcharvar.o: test/testcharvar.cpp lib/astutils.h lib/check.h lib/checkoth
625625
test/testclangimport.o: test/testclangimport.cpp lib/astutils.h lib/clangimport.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
626626
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testclangimport.o test/testclangimport.cpp
627627

628-
test/testclass.o: test/testclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
628+
test/testclass.o: test/testclass.cpp externals/tinyxml2/tinyxml2.h lib/astutils.h lib/check.h lib/checkclass.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h test/testsuite.h
629629
$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS) $(UNDEF_STRICT_ANSI) -c -o test/testclass.o test/testclass.cpp
630630

631631
test/testcmdlineparser.o: test/testcmdlineparser.cpp cli/cmdlineparser.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h test/redirect.h test/testsuite.h

gui/aboutdialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QDialog>
20-
#include <QWidget>
21-
#include <QString>
2219
#include "aboutdialog.h"
2320

21+
#include <QDialogButtonBox>
22+
#include <QLabel>
23+
2424
AboutDialog::AboutDialog(const QString &version, const QString &extraVersion, QWidget *parent)
2525
: QDialog(parent)
2626
{

gui/applicationdialog.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QString>
20-
#include <QWidget>
21-
#include <QDialog>
19+
#include "applicationdialog.h"
20+
21+
#include <QDialogButtonBox>
2222
#include <QFileDialog>
2323
#include <QMessageBox>
24-
#include "applicationdialog.h"
24+
#include <QPushButton>
25+
2526
#include "application.h"
2627
#include "common.h"
2728

gui/applicationlist.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19+
#include "applicationlist.h"
20+
1921
#include <QFileInfo>
20-
#include <QObject>
2122
#include <QSettings>
2223
#include <QStringList>
2324

2425
#include "common.h"
25-
#include "applicationlist.h"
2626
#include "application.h"
2727

2828
#include <cstdlib>

gui/checkstatistics.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QDebug>
20-
#include <QStringList>
2119
#include "checkstatistics.h"
2220

21+
#include <QDebug>
22+
2323
CheckStatistics::CheckStatistics(QObject *parent)
2424
: QObject(parent)
2525
{

gui/checkstatistics.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
#define CHECKSTATISTICS_H
2121

2222
#include <QObject>
23+
#include <QMap>
24+
#include <QString>
25+
2326
#include "showtypes.h"
2427

2528
/// @addtogroup GUI

gui/checkthread.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,13 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QApplication>
20-
#include <QString>
19+
#include "checkthread.h"
20+
2121
#include <QDebug>
2222
#include <QDir>
2323
#include <QFile>
24-
#include <QFileInfo>
25-
#include <QJsonDocument>
26-
#include <QJsonObject>
2724
#include <QProcess>
2825
#include <QSettings>
29-
#include "checkthread.h"
3026
#include "erroritem.h"
3127
#include "threadresult.h"
3228
#include "cppcheck.h"

gui/codeeditor.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#include <QtWidgets>
2-
#include <QShortcut>
31
#include "codeeditor.h"
2+
3+
#include <QShortcut>
4+
#include <QPainter>
45
#include "codeeditorstyle.h"
56

67

gui/codeeditor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include <QSyntaxHighlighter>
55
#include <QPlainTextEdit>
6-
#include <QObject>
76
#include <QRegularExpression>
87

98
class CodeEditorStyle;

gui/codeeditstyledialog.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include "codeeditor.h"
2019
#include "codeeditstyledialog.h"
20+
21+
#include "codeeditor.h"
2122
#include "codeeditstylecontrols.h"
22-
#include <QHBoxLayout>
23-
#include <QVBoxLayout>
2423
#include <QFormLayout>
2524
#include <QDialogButtonBox>
2625

0 commit comments

Comments
 (0)