summaryrefslogtreecommitdiff
path: root/src/resources/loaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-25 19:32:59 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-25 19:32:59 +0300
commit1b1a7cea1c6b81438bacc86b93cb80a78430790f (patch)
treed23f4e0beea6b4e5c570afafd9ad9de6b68ba812 /src/resources/loaders
parentbb8be1acea37f09c134d7d4042869a679cf8a12b (diff)
downloadplus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.gz
plus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.bz2
plus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.tar.xz
plus-1b1a7cea1c6b81438bacc86b93cb80a78430790f.zip
Change namespace in resources loaders from other to Loader.
Diffstat (limited to 'src/resources/loaders')
-rw-r--r--src/resources/loaders/imageloader.cpp2
-rw-r--r--src/resources/loaders/imageloader.h4
-rw-r--r--src/resources/loaders/musicloader.cpp4
-rw-r--r--src/resources/loaders/musicloader.h4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index 936d9b090..d3ab9facc 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -80,7 +80,7 @@ namespace
};
} // namespace
-Image *ImageLoader::getImage(const std::string &idPath)
+Image *Loader::getImage(const std::string &idPath)
{
DyedImageLoader rl = { idPath };
return static_cast<Image*>(resourceManager->get(idPath,
diff --git a/src/resources/loaders/imageloader.h b/src/resources/loaders/imageloader.h
index 6d60782a5..725511ede 100644
--- a/src/resources/loaders/imageloader.h
+++ b/src/resources/loaders/imageloader.h
@@ -29,13 +29,13 @@
class Image;
-namespace ImageLoader
+namespace Loader
{
/**
* Convenience wrapper around ResourceManager::get for loading
* images.
*/
Image *getImage(const std::string &idPath) A_WARN_UNUSED;
-} // namespace ImageLoader
+} // namespace Loader
#endif // RESOURCES_LOADERS_IMAGELOADER_H
diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp
index 0b47cc269..2751dbfae 100644
--- a/src/resources/loaders/musicloader.cpp
+++ b/src/resources/loaders/musicloader.cpp
@@ -60,14 +60,14 @@ namespace
};
} // namespace
-SDLMusic *MusicLoader::getMusic(const std::string &idPath)
+SDLMusic *Loader::getMusic(const std::string &idPath)
{
ResourceLoader rl = { idPath, &SDLMusic::load };
return static_cast<SDLMusic*>(resourceManager->get(
idPath, ResourceLoader::load, &rl));
}
-SoundEffect *MusicLoader::getSoundEffect(const std::string &idPath)
+SoundEffect *Loader::getSoundEffect(const std::string &idPath)
{
ResourceLoader rl = { idPath, &SoundEffect::load };
return static_cast<SoundEffect*>(resourceManager->get(
diff --git a/src/resources/loaders/musicloader.h b/src/resources/loaders/musicloader.h
index 0d005414f..233fe9a03 100644
--- a/src/resources/loaders/musicloader.h
+++ b/src/resources/loaders/musicloader.h
@@ -31,7 +31,7 @@ class SDLMusic;
class Resource;
class SoundEffect;
-namespace MusicLoader
+namespace Loader
{
/**
* Convenience wrapper around ResourceManager::get for loading
@@ -44,6 +44,6 @@ namespace MusicLoader
* samples.
*/
SoundEffect *getSoundEffect(const std::string &idPath) A_WARN_UNUSED;
-}
+} // namespace Loader
#endif // RESOURCES_RESOURCEMANAGER_MUSICLOADER_H