Cleanup std includes

tobanteAudio · Sep 30, 2023 · 733d85a · 733d85a
1 parent 4ce0159
commit 733d85a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 25 deletions.
diff --git a/example/app-sdl/main.cpp b/example/app-sdl/main.cpp
@@ -1,9 +1,8 @@
-#include <stdbool.h>
-#include <stdio.h>
-
 #include <cairo/cairo.h>
 #include <SDL2/SDL.h>
 
+#include <cstdio>
+
 int main(int argc, char* argv[])
 {
  SDL_Init(SDL_INIT_VIDEO);

diff --git a/example/app/main.cpp b/example/app/main.cpp
@@ -1,5 +1,5 @@
+#include <cstdio>
 #include <iostream>
-#include <stdio.h>
 #include <vector>
 
 #include "bindings/imgui_impl_glfw.h"

diff --git a/example/plugin-imgui/src/audio_plugin.cpp b/example/plugin-imgui/src/audio_plugin.cpp
@@ -4,7 +4,7 @@
 
 #include "audio_plugin.hpp"
 
-#include <string.h>
+#include <cstring>
 
 clap_host const* clapHost;
 extern clap_plugin_timer_support guiTimerSupport;

diff --git a/example/plugin-imgui/src/gain_plugin.cpp b/example/plugin-imgui/src/gain_plugin.cpp
@@ -4,13 +4,13 @@
 
 #include "gain_plugin.hpp"
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "imgui.h"
 
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 static const clap_param_info _param_info[GainPlugin::NUM_PARAMS] = {
  {0, CLAP_PARAM_REQUIRES_PROCESS, nullptr, "Volume", "", -60.0, 12.0, 0.0},
  {1, CLAP_PARAM_REQUIRES_PROCESS, nullptr, "Pan", "", -100.0, 100.0, 0.0}

diff --git a/example/plugin-imgui/src/gui.cpp b/example/plugin-imgui/src/gui.cpp
@@ -1,11 +1,11 @@
 // generic ui functions.
 // plugin implementations that use imgui should not need to touch this file.
 
-#include <stdio.h>
-#include <string.h>
-
 #include "audio_plugin.hpp"
 
+#include <cstdio>
+#include <cstring>
+
 bool AudioPlugin::createUI(char const* api, bool is_floating)
 {
  return isApiSupported(api, is_floating);

diff --git a/example/plugin-imgui/src/main_clap.cpp b/example/plugin-imgui/src/main_clap.cpp
@@ -1,16 +1,15 @@
-#include <cstdlib>
-#include <stdint.h>
-#include <string.h>
-
-#include <string_view>
-
 #if defined _WIN32
 #include <windows.h>
 HINSTANCE g_hinst;
 #endif
 
 #include "gain_plugin.hpp"
 
+#include <cstdint>
+#include <cstdlib>
+#include <cstring>
+#include <string_view>
+
 namespace factory {
 auto getPluginCount(clap_plugin_factory const* factory) -> uint32_t { return 1; }
 

diff --git a/src/ta/ui/window/window.cpp b/src/ta/ui/window/window.cpp
@@ -1,15 +1,15 @@
 #include "window.hpp"
 
-#include <cstdlib>
-#include <optional>
-#include <string>
-
 #define GLFW_EXPOSE_NATIVE_WIN32
 #include <cairo/cairo-win32.h>
 #include <cairo/cairo.h>
 #include <GLFW/glfw3.h>
 #include <GLFW/glfw3native.h>
 
+#include <cstdlib>
+#include <optional>
+#include <string>
+
 namespace ta {
 
 namespace detail {
@@ -28,9 +28,9 @@ struct WindowPimpl
  GLFWwindow* glfwWindow{nullptr};
  cairo_surface_t* surface;
  cairo_t* ctx;
- Optional<Canvas> canvas;
+ std::optional<Canvas> canvas;
 
- String title;
+ std::string title;
  int initialWidth;
  int initialHeight;
 };