From 4c6264db7ad4f0ae8a6c001903b47741abb94d8c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 29 May 2016 14:55:40 +0300 Subject: Fix code style. --- src/resources/loaders/shaderloader.cpp | 2 +- src/resources/loaders/spritedefloader.cpp | 2 -- src/resources/loaders/subimageloader.cpp | 1 - src/resources/loaders/subimageloader.h | 2 +- src/resources/loaders/subimagesetloader.cpp | 3 --- 5 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/resources/loaders') diff --git a/src/resources/loaders/shaderloader.cpp b/src/resources/loaders/shaderloader.cpp index 683e4206d..bd5c35dee 100644 --- a/src/resources/loaders/shaderloader.cpp +++ b/src/resources/loaders/shaderloader.cpp @@ -55,7 +55,7 @@ namespace return resource; } }; -} +} // namespace Resource *Loader::getShader(const unsigned int type, const std::string &name) diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp index 3c68b7c87..d49955ac4 100644 --- a/src/resources/loaders/spritedefloader.cpp +++ b/src/resources/loaders/spritedefloader.cpp @@ -20,7 +20,6 @@ * along with this program. If not, see . */ -#include "logger.h" #include "settings.h" #include "resources/loaders/spritedefloader.h" @@ -29,7 +28,6 @@ #include "resources/sprite/spritedef.h" -#include "utils/checkutils.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp index 9d61a305d..1331da245 100644 --- a/src/resources/loaders/subimageloader.cpp +++ b/src/resources/loaders/subimageloader.cpp @@ -29,7 +29,6 @@ #include "resources/resourcemanager/resourcemanager.h" #include "utils/checkutils.h" -#include "utils/physfsrwops.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/resources/loaders/subimageloader.h b/src/resources/loaders/subimageloader.h index 222c967e1..05586d6cc 100644 --- a/src/resources/loaders/subimageloader.h +++ b/src/resources/loaders/subimageloader.h @@ -34,6 +34,6 @@ namespace Loader const int y, const int width, const int height) A_WARN_UNUSED; -} // namespace SubImageLoader +} // namespace Loader #endif // RESOURCES_RESOURCEMANAGER_SUBIMAGELOADER_H diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp index 39068bce3..a8db6771a 100644 --- a/src/resources/loaders/subimagesetloader.cpp +++ b/src/resources/loaders/subimagesetloader.cpp @@ -20,8 +20,6 @@ * along with this program. If not, see . */ -#include "logger.h" - #include "resources/image.h" #include "resources/imageset.h" @@ -29,7 +27,6 @@ #include "resources/loaders/subimagesetloader.h" -#include "utils/checkutils.h" #include "utils/stringutils.h" #include "debug.h" -- cgit v1.2.3-70-g09d2