diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/applicationBase.cpp | 2 | ||||
| -rw-r--r-- | ui/editNetwork.cpp | 2 | ||||
| -rw-r--r-- | ui/icon.h | 2 | ||||
| -rw-r--r-- | ui/imgui_extras.cpp | 2 | ||||
| -rw-r--r-- | ui/imgui_extras.h | 2 | ||||
| -rw-r--r-- | ui/imgui_wrap.h | 13 | ||||
| -rw-r--r-- | ui/mainApplication.cpp | 5 | ||||
| -rw-r--r-- | ui/mainWindow.cpp | 8 | ||||
| -rw-r--r-- | ui/queryTool.cpp | 2 | ||||
| -rw-r--r-- | ui/svgIcon.h | 2 | ||||
| -rw-r--r-- | ui/window.cpp | 7 |
11 files changed, 12 insertions, 35 deletions
diff --git a/ui/applicationBase.cpp b/ui/applicationBase.cpp index 961007b..6daffbe 100644 --- a/ui/applicationBase.cpp +++ b/ui/applicationBase.cpp @@ -1,6 +1,6 @@ #include "applicationBase.h" -#include "imgui_wrap.h" #include <SDL2/SDL.h> +#include <imgui.h> #include <stdexcept> ApplicationBase::ApplicationBase() diff --git a/ui/editNetwork.cpp b/ui/editNetwork.cpp index c900191..6ee0210 100644 --- a/ui/editNetwork.cpp +++ b/ui/editNetwork.cpp @@ -2,11 +2,11 @@ #include "builders/freeExtend.h" #include "builders/join.h" #include "builders/straight.h" -#include "imgui_wrap.h" #include <game/gamestate.h> #include <game/terrain.h> #include <gfx/gl/sceneShader.h> #include <gfx/models/texture.h> +#include <imgui.h> constexpr const glm::u8vec4 TRANSPARENT_BLUE {30, 50, 255, 200}; @@ -1,9 +1,9 @@ #pragma once -#include "imgui_wrap.h" #include <filesystem> #include <glArrays.h> #include <glm/glm.hpp> +#include <imgui.h> class Image; diff --git a/ui/imgui_extras.cpp b/ui/imgui_extras.cpp index 1643f4f..f2ae8ba 100644 --- a/ui/imgui_extras.cpp +++ b/ui/imgui_extras.cpp @@ -1,5 +1,5 @@ -#define IMGUI_INTERNAL #include "imgui_extras.h" +#include <imgui_internal.h> namespace IltGui { bool diff --git a/ui/imgui_extras.h b/ui/imgui_extras.h index 0babaa3..b27bc17 100644 --- a/ui/imgui_extras.h +++ b/ui/imgui_extras.h @@ -1,4 +1,4 @@ -#include "imgui_wrap.h" +#include <imgui.h> namespace IltGui { // NOLINTBEGIN(readability-identifier-naming) diff --git a/ui/imgui_wrap.h b/ui/imgui_wrap.h deleted file mode 100644 index 520d8b8..0000000 --- a/ui/imgui_wrap.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#include "imgui.h" // IWYU pragma: export -#ifdef IMGUI_INTERNAL -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wconversion" -# pragma GCC diagnostic ignored "-Wsign-conversion" -# include "imgui_internal.h" // IWYU pragma: export -# pragma GCC diagnostic pop -#endif -#pragma GCC diagnostic pop diff --git a/ui/mainApplication.cpp b/ui/mainApplication.cpp index 6cb1037..78f4fd4 100644 --- a/ui/mainApplication.cpp +++ b/ui/mainApplication.cpp @@ -1,10 +1,7 @@ #include "mainApplication.h" +#include "backends/imgui_impl_sdl2.h" #include "game/gamestate.h" #include "game/worldobject.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" -#include "backends/imgui_impl_sdl2.h" -#pragma GCC diagnostic pop void MainApplication::mainLoop() diff --git a/ui/mainWindow.cpp b/ui/mainWindow.cpp index 57dabc0..1834a33 100644 --- a/ui/mainWindow.cpp +++ b/ui/mainWindow.cpp @@ -1,12 +1,8 @@ #include "mainWindow.h" -#include <format> -#include <stdexcept> - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" #include "backends/imgui_impl_opengl3.h" #include "backends/imgui_impl_sdl2.h" -#pragma GCC diagnostic pop +#include <format> +#include <stdexcept> MainWindow::MainWindow(ScreenAbsCoord size, const char * title, Uint32 flags) : Window {size, title, flags} { diff --git a/ui/queryTool.cpp b/ui/queryTool.cpp index 549bd9e..56eee9a 100644 --- a/ui/queryTool.cpp +++ b/ui/queryTool.cpp @@ -1,9 +1,9 @@ #include "queryTool.h" -#include "imgui_wrap.h" #include <game/gamestate.h> #include <game/selectable.h> #include <game/terrain.h> #include <game/worldobject.h> +#include <imgui.h> #include <ray.h> #include <stream_support.h> diff --git a/ui/svgIcon.h b/ui/svgIcon.h index 106f97c..02c1e53 100644 --- a/ui/svgIcon.h +++ b/ui/svgIcon.h @@ -1,9 +1,9 @@ #pragma once #include "glArrays.h" -#include "imgui_wrap.h" #include <config/types.h> #include <filesystem> +#include <imgui.h> #include <lunasvg.h> class SvgIcon { diff --git a/ui/window.cpp b/ui/window.cpp index 06857b2..c85cebe 100644 --- a/ui/window.cpp +++ b/ui/window.cpp @@ -1,11 +1,8 @@ #include "window.h" -#include <glad/gl.h> -#include <glm/glm.hpp> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wold-style-cast" #include "backends/imgui_impl_opengl3.h" #include "backends/imgui_impl_sdl2.h" -#pragma GCC diagnostic pop +#include <glad/gl.h> +#include <glm/glm.hpp> Window::Window(ScreenAbsCoord size, const char * title, Uint32 flags) : m_window {title, static_cast<int>(SDL_WINDOWPOS_CENTERED), static_cast<int>(SDL_WINDOWPOS_CENTERED), size.x, size.y, |