summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-29 14:55:40 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-29 14:55:40 +0300
commit4c6264db7ad4f0ae8a6c001903b47741abb94d8c (patch)
treea4e95239130dc4b86d036acd10c95f5fe3b96999 /src/resources/loaders
parentf6e76f469a81ff2d9e3714d39d1a8f4012cda2b8 (diff)
downloadmanaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.gz
manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.bz2
manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.tar.xz
manaverse-4c6264db7ad4f0ae8a6c001903b47741abb94d8c.zip
Fix code style.
Diffstat (limited to 'src/resources/loaders')
-rw-r--r--src/resources/loaders/shaderloader.cpp2
-rw-r--r--src/resources/loaders/spritedefloader.cpp2
-rw-r--r--src/resources/loaders/subimageloader.cpp1
-rw-r--r--src/resources/loaders/subimageloader.h2
-rw-r--r--src/resources/loaders/subimagesetloader.cpp3
5 files changed, 2 insertions, 8 deletions
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 <http://www.gnu.org/licenses/>.
*/
-#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 <http://www.gnu.org/licenses/>.
*/
-#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"