'ifnot' template property + hpp

src/frontend/ContentGfxCache.cpp

@@ -1,6 +1,4 @@
-#include "ContentGfxCache.h"
-
-#include <string>
+#include "ContentGfxCache.hpp"
 
 #include "../assets/Assets.h"
 #include "../content/Content.h"
@@ -9,7 +7,9 @@
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"
 #include "../voxels/Block.h"
-#include "UiDocument.h"
+#include "UiDocument.hpp"
+
+#include <string>
 
 ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) : content(content) {
     auto indices = content->getIndices();

src/frontend/ContentGfxCache.hpp

@@ -1,5 +1,5 @@
-#ifndef FRONTEND_BLOCKS_GFX_CACHE_H_
-#define FRONTEND_BLOCKS_GFX_CACHE_H_
+#ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
+#define FRONTEND_BLOCKS_GFX_CACHE_HPP_
 
 #include "../typedefs.h"
 
@@ -24,4 +24,4 @@ public:
     const Content* getContent() const;
 };
 
-#endif // FRONTEND_BLOCKS_GFX_CACHE_H_
+#endif // FRONTEND_BLOCKS_GFX_CACHE_HPP_

src/frontend/LevelFrontend.cpp

@@ -1,7 +1,7 @@
 #include "LevelFrontend.h"
 
 #include "../assets/Assets.h"
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../content/Content.h"
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/render/BlocksPreview.hpp"
@@ -9,7 +9,7 @@
 #include "../logic/PlayerController.h"
 #include "../voxels/Block.h"
 #include "../world/Level.h"
-#include "ContentGfxCache.h"
+#include "ContentGfxCache.hpp"
 
 LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets) 
   : level(controller->getLevel()),

src/frontend/UiDocument.cpp

@@ -1,4 +1,4 @@
-#include "UiDocument.h"
+#include "UiDocument.hpp"
 
 #include "../files/files.h"
 #include "../graphics/ui/elements/UINode.hpp"

src/frontend/UiDocument.hpp

@@ -1,5 +1,5 @@
-#ifndef FRONTEND_UI_DOCUMENT_H_
-#define FRONTEND_UI_DOCUMENT_H_
+#ifndef FRONTEND_UI_DOCUMENT_HPP_
+#define FRONTEND_UI_DOCUMENT_HPP_
 
 #include "../typedefs.h"
 
@@ -50,4 +50,4 @@ public:
     static std::shared_ptr<gui::UINode> readElement(fs::path file);
 };
 
-#endif // FRONTEND_UI_DOCUMENT_H_
+#endif // FRONTEND_UI_DOCUMENT_HPP_

src/frontend/debug_panel.cpp

@@ -1,8 +1,4 @@
-#include <string>
-#include <memory>
-#include <sstream>
-
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../delegates.h"
 #include "../engine.h"
 #include "../graphics/core/Mesh.hpp"
@@ -20,6 +16,10 @@
 #include "../world/Level.h"
 #include "../world/World.h"
 
+#include <string>
+#include <memory>
+#include <sstream>
+
 using namespace gui;
 
 static std::shared_ptr<Label> create_label(wstringsupplier supplier) {

src/frontend/hud.cpp

@@ -1,4 +1,4 @@
-#include "hud.h"
+#include "hud.hpp"
 
 #include "../assets/Assets.h"
 #include "../content/Content.h"
@@ -39,9 +39,9 @@
 #include "../window/Window.hpp"
 #include "../world/Level.h"
 #include "../world/World.h"
-#include "ContentGfxCache.h"
+#include "ContentGfxCache.hpp"
 #include "LevelFrontend.h"
-#include "UiDocument.h"
+#include "UiDocument.hpp"
 
 #include <assert.h>
 #include <memory>

src/frontend/hud.hpp

@@ -1,5 +1,5 @@
-#ifndef FRONTEND_HUD_H_
-#define FRONTEND_HUD_H_
+#ifndef FRONTEND_HUD_HPP_
+#define FRONTEND_HUD_HPP_
 
 #include "../typedefs.h"
 #include "../util/ObjectsKeeper.hpp"
@@ -164,4 +164,4 @@ public:
     std::shared_ptr<Inventory> getBlockInventory();
 };
 
-#endif // FRONTEND_HUD_H_
+#endif // FRONTEND_HUD_HPP_

src/frontend/menu.cpp

@@ -17,7 +17,7 @@
 #include "../util/stringutil.h"
 #include "../window/Window.hpp"
 #include "locale/langs.h"
-#include "UiDocument.h"
+#include "UiDocument.hpp"
 
 namespace fs = std::filesystem;
 using namespace gui;

src/frontend/screens/LevelScreen.cpp

@@ -1,9 +1,9 @@
 #include "LevelScreen.hpp"
 
-#include "../hud.h"
+#include "../hud.hpp"
 #include "../LevelFrontend.h"
 #include "../../debug/Logger.hpp"
-#include "../../audio/audio.h"
+#include "../../audio/audio.hpp"
 #include "../../coders/imageio.hpp"
 #include "../../graphics/core/PostProcessing.h"
 #include "../../graphics/core/DrawContext.hpp"