Cleanup header includes using clang-tidy

https://clang.llvm.org/extra/clang-tidy/checks/misc/include-cleaner.html clang-tidy -p build/compile_commands.json --checks=misc-include-cleaner \ `find src/ examples/ -name *.cpp -o -name *.h -type f`
williamyang98 · Apr 9, 2024 · fc67204 · fc67204
1 parent debaf06
commit fc67204
Show file tree

Hide file tree

Showing 114 changed files with 654 additions and 453 deletions.
diff --git a/examples/app_helpers/app_audio.h b/examples/app_helpers/app_audio.h
@@ -1,8 +1,15 @@
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
 #include <memory>
 #include "basic_radio/basic_radio.h"
+#include "basic_radio/basic_audio_channel.h"
+#include "basic_radio/basic_audio_params.h"
+#include "dab/database/dab_database_types.h"
+#include "utility/span.h"
 #include "../audio/audio_pipeline.h"
+#include "../audio/frame.h"
 
 static void attach_audio_pipeline_to_radio(std::shared_ptr<AudioPipeline> audio_pipeline, BasicRadio& basic_radio) {
     if (audio_pipeline == nullptr) return;

diff --git a/examples/app_helpers/app_common_gui.cpp b/examples/app_helpers/app_common_gui.cpp
@@ -1,5 +1,6 @@
 #include "./app_common_gui.h"
 #include <stdio.h>
+#include <chrono>
 #include <thread>
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>

diff --git a/examples/app_helpers/app_common_gui.h b/examples/app_helpers/app_common_gui.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <stdint.h>
 #include <functional>
+#include <stddef.h>
 #include <string_view>
 
 struct CommonGui {

diff --git a/examples/app_helpers/app_io_buffers.h b/examples/app_helpers/app_io_buffers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdlib.h>
+#include <stdio.h>
 #include <condition_variable>
 #include <memory>
 #include <mutex>

diff --git a/examples/app_helpers/app_ofdm_blocks.h b/examples/app_helpers/app_ofdm_blocks.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include <stdint.h>
+#include <stddef.h>
 #include <complex>
 #include <memory>
 #include <vector>
 #include "utility/span.h"
-#include "ofdm/ofdm_demodulator.h"
+#include "ofdm/dab_mapper_ref.h"
 #include "ofdm/dab_ofdm_params_ref.h"
 #include "ofdm/dab_prs_ref.h"
-#include "ofdm/dab_mapper_ref.h"
-#include "ofdm/ofdm_helpers.h"
+#include "ofdm/ofdm_demodulator.h"
 #include "viterbi_config.h"
 #include "./app_io_buffers.h"
 

diff --git a/examples/app_helpers/app_radio_blocks.h b/examples/app_helpers/app_radio_blocks.h
@@ -1,9 +1,11 @@
 #pragma once
 
-#include <vector>
+#include <stddef.h>
 #include <memory>
+#include <vector>
 #include "basic_radio/basic_radio.h"
 #include "dab/constants/dab_parameters.h"
+#include "viterbi_config.h"
 #include "./app_io_buffers.h"
 
 class Basic_Radio_Block

diff --git a/examples/app_helpers/app_viterbi_convert_block.h b/examples/app_helpers/app_viterbi_convert_block.h
@@ -1,7 +1,11 @@
 #pragma once
 
 #include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <memory>
+#include <vector>
+#include "utility/span.h"
 #include "viterbi_config.h"
 #include "./app_io_buffers.h"
 

diff --git a/examples/apply_frequency_shift.cpp b/examples/apply_frequency_shift.cpp
@@ -1,7 +1,11 @@
-#include <stdio.h>
 #define _USE_MATH_DEFINES
 #include <cmath>
+#include <stdint.h>
+#include <stdio.h>
 #include <complex>
+#include <exception>
+#include <iostream>
+#include <string>
 #include <vector>
 #include "utility/span.h"
 

diff --git a/examples/audio/audio_pipeline.cpp b/examples/audio/audio_pipeline.cpp
@@ -1,8 +1,16 @@
 #include "./audio_pipeline.h"
 #include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <cmath>
 #include <cstring>
 #include <limits>
+#include <memory>
+#include <mutex>
+#include <utility>
+#include <vector>
+#include "utility/span.h"
+#include "./frame.h"
 
 template <typename T, typename U, typename F>
 static void audio_map_with_callback(tcb::span<const Frame<T>> src, tcb::span<Frame<U>> dest, F&& func) {

diff --git a/examples/audio/audio_pipeline.h b/examples/audio/audio_pipeline.h
@@ -1,15 +1,16 @@
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
 #include <condition_variable>
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <string>
+#include <string_view>
 #include <vector>
-#include <stdint.h>
+#include "utility/span.h"
 #include "./frame.h"
 #include "./ring_buffer.h"
-#include "utility/span.h"
 
 constexpr float DEFAULT_AUDIO_SAMPLE_RATE = 48000.0f;
 constexpr float DEFAULT_AUDIO_SINK_DURATION = 0.1f;

diff --git a/examples/audio/portaudio_sink.cpp b/examples/audio/portaudio_sink.cpp
@@ -1,6 +1,13 @@
 #include "./portaudio_sink.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+#include <portaudio.h>
+#include "utility/span.h"
+#include "./frame.h"
 
 #if _WIN32
 constexpr PaHostApiTypeId PORTAUDIO_TARGET_HOST_API_ID = PaHostApiTypeId::paDirectSound;

diff --git a/examples/audio/portaudio_sink.h b/examples/audio/portaudio_sink.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <portaudio.h>
+#include <stddef.h>
+#include <memory>
 #include <string>
+#include <string_view>
 #include <vector>
-#include "utility/span.h"
-#include "./frame.h"
+#include <portaudio.h>
 #include "./audio_pipeline.h"
 
 // Create this once before all port audio code

diff --git a/examples/basic_radio_app.cpp b/examples/basic_radio_app.cpp
@@ -1,6 +1,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <string>
@@ -12,28 +13,33 @@
 #endif
 
 #include <argparse/argparse.hpp>
-#include <fmt/core.h>
-#include "basic_radio/basic_radio.h"
+#include <easylogging++.h>
 #include "basic_radio/basic_audio_channel.h"
+#include "basic_radio/basic_radio.h"
 #include "basic_scraper/basic_scraper.h"
+#include "dab/constants/dab_parameters.h"
+#include "dab/database/dab_database_types.h"
+#include "viterbi_config.h"
 #include "./app_helpers/app_io_buffers.h"
+#include "./app_helpers/app_logging.h"
 #include "./app_helpers/app_ofdm_blocks.h"
 #include "./app_helpers/app_radio_blocks.h"
 #include "./app_helpers/app_viterbi_convert_block.h"
-#include "./app_helpers/app_logging.h"
 
 #if !BUILD_COMMAND_LINE
-#include "./app_helpers/app_audio.h"
-#include "./audio/audio_pipeline.h"
-#include "./audio/portaudio_sink.h"
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
+#include <fmt/format.h>
+#include <portaudio.h>
+#include "./app_helpers/app_audio.h"
 #include "./app_helpers/app_common_gui.h"
-#include "./gui/ofdm/render_ofdm_demod.h"
-#include "./gui/ofdm/render_profiler.h"
+#include "./audio/audio_pipeline.h"
+#include "./audio/portaudio_sink.h"
+#include "./gui/audio/render_portaudio_controls.h"
 #include "./gui/basic_radio/basic_radio_view_controller.h"
 #include "./gui/basic_radio/render_basic_radio.h"
-#include "./gui/audio/render_portaudio_controls.h"
+#include "./gui/ofdm/render_ofdm_demod.h"
+#include "./gui/ofdm/render_profiler.h"
 #endif
 
 void init_parser(argparse::ArgumentParser& parser) {

diff --git a/examples/convert_viterbi.cpp b/examples/convert_viterbi.cpp
@@ -1,16 +1,21 @@
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <exception>
 #include <iostream>
+#include <memory>
 #include <string>
+#include <vector>
 
 #if _WIN32
 #include <io.h>
 #include <fcntl.h>
 #endif
 
 #include <argparse/argparse.hpp>
-#include "dab/constants/dab_parameters.h"
+#include "utility/span.h"
 #include "viterbi_config.h"
+#include "./app_helpers/app_io_buffers.h"
 #include "./app_helpers/app_viterbi_convert_block.h"
 
 void init_parser(argparse::ArgumentParser& parser) {

diff --git a/examples/device/device.cpp b/examples/device/device.cpp
@@ -4,9 +4,16 @@ extern "C" {
 #include <rtl-sdr.h>
 }
 
-#include <fmt/core.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <cmath>
+#include <memory>
+#include <string>
+#include <thread>
+#include <vector>
+#include <fmt/format.h>
+#include "utility/span.h"
 
 Device::Device(rtlsdr_dev_t* device, const DeviceDescriptor& descriptor, const int block_size)
 :  m_descriptor(descriptor), m_device(device), m_block_size(block_size)

diff --git a/examples/device/device.h b/examples/device/device.h
@@ -1,13 +1,13 @@
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
+#include <functional>
 #include <list>
 #include <memory>
-#include <mutex>
-#include <stdint.h>
 #include <string>
 #include <thread>
 #include <vector>
-#include <functional>
 #include "utility/span.h"
 
 struct DeviceDescriptor {

diff --git a/examples/device/device_list.cpp b/examples/device/device_list.cpp
@@ -1,8 +1,14 @@
 #include "./device_list.h"
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
+#include "./device.h"
 
 extern "C" {
 #include <rtl-sdr.h>

diff --git a/examples/device/device_list.h b/examples/device/device_list.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#include <stdint.h>
-#include <list>
+#include <stddef.h>
 #include <memory>
 #include <mutex>
 #include <vector>
-
-#include "./device.h"
 #include "utility/span.h"
+#include "./device.h"
 
 class DeviceList 
 {

diff --git a/examples/gui/audio/render_portaudio_controls.cpp b/examples/gui/audio/render_portaudio_controls.cpp
@@ -1,6 +1,9 @@
 #include "./render_portaudio_controls.h"
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
+#include <memory>
+#include <mutex>
+#include "audio/audio_pipeline.h"
 #include "audio/portaudio_sink.h"
 
 void RenderPortAudioControls(PortAudioThreadedActions& actions, std::shared_ptr<AudioPipeline> pipeline) {

diff --git a/examples/gui/audio/render_portaudio_controls.h b/examples/gui/audio/render_portaudio_controls.h
@@ -1,13 +1,16 @@
 #pragma once
 
-#include <portaudio.h>
 #include <condition_variable>
 #include <functional>
 #include <memory>
 #include <mutex>
 #include <thread>
-#include "audio/portaudio_sink.h"
+#include <utility>
+#include <vector>
+#include <portaudio.h>
 #include "audio/audio_pipeline.h"
+#include "audio/portaudio_sink.h"
+#include "utility/span.h"
 
 class ThreadedRunner
 {

diff --git a/examples/gui/basic_radio/CMakeLists.txt b/examples/gui/basic_radio/CMakeLists.txt
@@ -13,5 +13,4 @@ add_library(basic_radio_gui STATIC
 set_target_properties(basic_radio_gui PROPERTIES CXX_STANDARD 17)
 target_include_directories(basic_radio_gui PRIVATE ${SRC_DIR} ${ROOT_DIR} ${EXAMPLES_DIR})
 target_include_directories(basic_radio_gui PRIVATE ${CMAKE_SOURCE_DIR}/vendor/stb ${SRC_DIR}/../)
-target_compile_definitions(basic_radio_gui PRIVATE ELPP_THREAD_SAFE)
-target_link_libraries(basic_radio_gui PRIVATE basic_radio imgui easyloggingpp fmt)
+target_link_libraries(basic_radio_gui PRIVATE basic_radio imgui fmt)
diff --git a/examples/gui/basic_radio/basic_radio_view_controller.cpp b/examples/gui/basic_radio/basic_radio_view_controller.cpp
@@ -1,8 +1,13 @@
 #include "./basic_radio_view_controller.h"
-#include "basic_radio/basic_radio.h"
-#include "basic_radio/basic_slideshow.h"
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <memory>
+#include "dab/database/dab_database_types.h"
+#include "dab/mot/MOT_entities.h"
+#include "utility/span.h"
+#include "./texture.h"
 
 BasicRadioViewController::BasicRadioViewController(const size_t _max_textures) {
     textures.set_max_size(_max_textures);

diff --git a/examples/gui/basic_radio/basic_radio_view_controller.h b/examples/gui/basic_radio/basic_radio_view_controller.h
@@ -1,13 +1,13 @@
 #pragma once
 
+#include <stddef.h>
 #include <stdint.h>
-#include <unordered_map>
 #include <memory>
 #include <optional>
-#include "utility/span.h"
-#include "utility/lru_cache.h"
+#include "dab/database/dab_database_types.h"
 #include "dab/mot/MOT_entities.h"
-#include "dab/database/dab_database_entities.h"
+#include "utility/lru_cache.h"
+#include "utility/span.h"
 #include "./texture.h"
 
 struct Basic_Slideshow;