'ifnot' template property + hpp

src/assets/Assets.cpp

@@ -1,11 +1,11 @@
 #include "Assets.h"
 
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../graphics/core/Texture.hpp"
 #include "../graphics/core/Shader.hpp"
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/core/Font.hpp"
-#include "../frontend/UiDocument.h"
+#include "../frontend/UiDocument.hpp"
 #include "../logic/scripting/scripting.h"
 
 Assets::~Assets() {

src/assets/AssetsLoader.cpp

@@ -1,13 +1,8 @@
 #include "AssetsLoader.h"
+
 #include "Assets.h"
-
-#include "assetload_funcs.h"
-
-#include <iostream>
-#include <memory>
-
+#include "assetload_funcs.hpp"
 #include "../util/ThreadPool.hpp"
-
 #include "../constants.h"
 #include "../data/dynamic.h"
 #include "../debug/Logger.hpp"
@@ -19,6 +14,9 @@
 #include "../graphics/core/Texture.hpp"
 #include "../logic/scripting/scripting.h"
 
+#include <iostream>
+#include <memory>
+
 static debug::Logger logger("assets-loader");
 
 AssetsLoader::AssetsLoader(Assets* assets, const ResPaths* paths) 

src/assets/assetload_funcs.cpp

@@ -1,7 +1,8 @@
-#include "assetload_funcs.h"
+#include "assetload_funcs.hpp"
+
 #include "Assets.h"
 #include "AssetsLoader.h"
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../files/files.h"
 #include "../files/engine_paths.h"
 #include "../coders/imageio.hpp"
@@ -13,7 +14,7 @@
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/core/Font.hpp"
 #include "../graphics/core/TextureAnimation.hpp"
-#include "../frontend/UiDocument.h"
+#include "../frontend/UiDocument.hpp"
 
 #include <iostream>
 #include <stdexcept>

src/assets/assetload_funcs.hpp

@@ -1,5 +1,5 @@
-#ifndef ASSETS_ASSET_LOADERS_H_
-#define ASSETS_ASSET_LOADERS_H_
+#ifndef ASSETS_ASSET_LOADERS_HPP_
+#define ASSETS_ASSET_LOADERS_HPP_
 
 #include "Assets.h"
 
@@ -59,4 +59,4 @@ namespace assetload {
     );
 }
 
-#endif // ASSETS_ASSET_LOADERS_H_
+#endif // ASSETS_ASSET_LOADERS_HPP_