From b5b9c95de160a97701777d37187de194d0b29e61 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 2 Jan 2022 19:55:40 +0000 Subject: Replace include guard macros with pragma once --- ui/font.h | 5 +---- ui/gameMainWindow.h | 5 +---- ui/icon.h | 5 +---- ui/iconButton.h | 5 +---- ui/manualCameraController.h | 4 +--- ui/toolbar.h | 5 +---- ui/uiComponent.h | 5 +---- ui/uiComponentPlacer.h | 5 +---- ui/window.h | 5 +---- 9 files changed, 9 insertions(+), 35 deletions(-) (limited to 'ui') diff --git a/ui/font.h b/ui/font.h index 4b44ee3..f8a29de 100644 --- a/ui/font.h +++ b/ui/font.h @@ -1,5 +1,4 @@ -#ifndef FONT_H -#define FONT_H +#pragma once #include #include @@ -48,5 +47,3 @@ protected: mutable std::map charsData; mutable std::vector fontTextures; }; - -#endif diff --git a/ui/gameMainWindow.h b/ui/gameMainWindow.h index b85b8a8..e26ad2d 100644 --- a/ui/gameMainWindow.h +++ b/ui/gameMainWindow.h @@ -1,5 +1,4 @@ -#ifndef UI_GAMEMAINWINDOW_H -#define UI_GAMEMAINWINDOW_H +#pragma once #include "chronology.hpp" #include "gfx/gl/camera.h" @@ -21,5 +20,3 @@ private: Shader shader; Camera camera; }; - -#endif diff --git a/ui/icon.h b/ui/icon.h index 2650218..961c11b 100644 --- a/ui/icon.h +++ b/ui/icon.h @@ -1,5 +1,4 @@ -#ifndef ICON_H -#define ICON_H +#pragma once #include #include @@ -18,5 +17,3 @@ public: private: glTexture m_texture; }; - -#endif diff --git a/ui/iconButton.h b/ui/iconButton.h index 53ada74..6ac9317 100644 --- a/ui/iconButton.h +++ b/ui/iconButton.h @@ -1,5 +1,4 @@ -#ifndef ICONBUTTON_H -#define ICONBUTTON_H +#pragma once #include "icon.h" #include "uiComponent.h" @@ -24,5 +23,3 @@ public: glVertexArray m_vertexArrayObject; glBuffer m_vertexArrayBuffer; }; - -#endif diff --git a/ui/manualCameraController.h b/ui/manualCameraController.h index 5ed45f5..d15fa76 100644 --- a/ui/manualCameraController.h +++ b/ui/manualCameraController.h @@ -1,5 +1,4 @@ -#ifndef MANUAL_CAMERA_CONTROLLER_H -#define MANUAL_CAMERA_CONTROLLER_H +#pragma once #include "uiComponent.h" #include @@ -25,4 +24,3 @@ private: float direction {quarter_pi}; float dist {40}, pitch {quarter_pi}; }; -#endif diff --git a/ui/toolbar.h b/ui/toolbar.h index 28aba6c..d141139 100644 --- a/ui/toolbar.h +++ b/ui/toolbar.h @@ -1,5 +1,4 @@ -#ifndef TOOLBAR_H -#define TOOLBAR_H +#pragma once #include "collection.hpp" #include "iconButton.h" @@ -22,5 +21,3 @@ public: Collection icons; }; - -#endif diff --git a/ui/uiComponent.h b/ui/uiComponent.h index e7b3a0b..8a9613e 100644 --- a/ui/uiComponent.h +++ b/ui/uiComponent.h @@ -1,5 +1,4 @@ -#ifndef UICOMPONENT_H -#define UICOMPONENT_H +#pragma once #include #include @@ -30,5 +29,3 @@ public: Position position; }; - -#endif diff --git a/ui/uiComponentPlacer.h b/ui/uiComponentPlacer.h index b68c4d8..1e64f78 100644 --- a/ui/uiComponentPlacer.h +++ b/ui/uiComponentPlacer.h @@ -1,5 +1,4 @@ -#ifndef UICOMPONENTPLACER_H -#define UICOMPONENTPLACER_H +#pragma once #include @@ -18,5 +17,3 @@ private: float current {}; float max {}; }; - -#endif diff --git a/ui/window.h b/ui/window.h index 25443bd..49cdf45 100644 --- a/ui/window.h +++ b/ui/window.h @@ -1,5 +1,4 @@ -#ifndef DISPLAY_INCLUDED_H -#define DISPLAY_INCLUDED_H +#pragma once #include "chronology.hpp" #include "collection.hpp" @@ -37,5 +36,3 @@ protected: Collection uiComponents; UIShader uiShader; }; - -#endif -- cgit v1.2.3