Skip to content

Commit bd1ae69

Browse files
firewavefirewave
authored
cleaned up includes based on include-what-you-use (danmar#4599)
1 parent 68504a0 commit bd1ae69

56 files changed

Lines changed: 93 additions & 14 deletions

Some content is hidden

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

‎.github/workflows/iwyu.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
make -C cmake.output autogen
4040
# make sure the auto-generated GUI dependencies exist
4141
make -C cmake.output gui-build-deps
42+
make -C cmake.output triage-build-ui-deps
4243
4344
- name: Build Qt mappings
4445
run: |
@@ -52,6 +53,11 @@ jobs:
5253
# do not fail for now so the output is being saved
5354
iwyu_tool -p cmake.output -j $(nproc) -- -w > iwyu.log || true
5455
56+
- uses: actions/upload-artifact@v3
57+
with:
58+
name: Compilation Database
59+
path: ./cmake.output/compile_commands.json
60+
5561
- uses: actions/upload-artifact@v3
5662
with:
5763
name: Qt Mappings

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ $(libcppdir)/checkmemoryleak.o: lib/checkmemoryleak.cpp lib/astutils.h lib/check
505505
$(libcppdir)/checknullpointer.o: lib/checknullpointer.cpp lib/astutils.h lib/check.h lib/checknullpointer.h lib/color.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/smallvector.h lib/sourcelocation.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 lib/vfvalue.h
506506
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checknullpointer.cpp
507507

508-
$(libcppdir)/checkother.o: lib/checkother.cpp lib/astutils.h lib/check.h lib/checkclass.h lib/checkother.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/fwdanalysis.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.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 lib/vfvalue.h
508+
$(libcppdir)/checkother.o: lib/checkother.cpp lib/astutils.h lib/check.h lib/checkclass.h lib/checkother.h lib/config.h lib/errortypes.h lib/fwdanalysis.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.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 lib/vfvalue.h
509509
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/checkother.cpp
510510

511511
$(libcppdir)/checkpostfixoperator.o: lib/checkpostfixoperator.cpp lib/check.h lib/checkpostfixoperator.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.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/vfvalue.h

‎cli/cmdlineparser.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,14 @@
3737
#include <cstdio>
3838
#include <cstdlib> // EXIT_FAILURE
3939
#include <cstring>
40-
#include <fstream>
40+
#include <fstream> // IWYU pragma: keep
4141
#include <iostream>
42+
#include <iterator>
4243
#include <list>
4344
#include <set>
4445
#include <sstream> // IWYU pragma: keep
46+
#include <stdexcept>
47+
#include <unordered_set>
4548
#include <utility>
4649

4750
#ifdef HAVE_RULES

‎cli/cppcheckexecutor.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,13 @@
4141
#include "processexecutor.h"
4242
#endif
4343

44+
#include <algorithm>
4445
#include <atomic>
4546
#include <cstdio>
4647
#include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
4748
#include <functional>
4849
#include <iostream>
50+
#include <iterator>
4951
#include <list>
5052
#include <memory>
5153
#include <sstream> // IWYU pragma: keep

‎cli/precompiled.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
#pragma once
2020

21+
// IWYU pragma: begin_keep
2122
#include "config.h"
2223
#include "cppcheck.h"
2324
#include "settings.h"
25+
// IWYU pragma: end_keep

‎cli/processexecutor.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include <sys/select.h>
4444
#include <sys/wait.h>
4545
#include <unistd.h>
46+
#include <utility>
4647
#include <fcntl.h>
4748

4849

‎gui/precompiled.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#pragma once
2020

21+
// IWYU pragma: begin_keep
2122
#include "checkthread.h"
2223
#include "codeeditor.h"
2324
#include "codeeditorstyle.h"
@@ -29,3 +30,4 @@
2930

3031
#include <QFile>
3132
#include <QVariant>
33+
// IWYU pragma: end_keep

‎gui/threadhandler.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "resultsview.h"
2424
#include "settings.h"
2525

26-
#include <list>
2726
#include <string>
2827
#include <utility>
2928

‎lib/check.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
#include "tokenize.h"
2727
#include "vfvalue.h"
2828

29+
#include <algorithm>
2930
#include <cctype>
3031
#include <iostream>
32+
#include <stdexcept>
3133
#include <utility>
3234

3335
//---------------------------------------------------------------------------

‎lib/checkautovariables.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "valueflow.h"
3232
#include "vfvalue.h"
3333

34+
#include <algorithm>
3435
#include <list>
3536
#include <unordered_set>
3637
#include <utility>

0 commit comments

Comments
 (0)