summaryrefslogtreecommitdiff
path: root/src/resources/resourcemanager/resourcemanager.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-08 23:36:03 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-08 23:36:03 +0300
commitbcd8bc4d0981ec25c04423eb1ed6425a28e911d4 (patch)
treefd9dd33fc466903251297cf4ac737bc2bf03fa27 /src/resources/resourcemanager/resourcemanager.h
parent179e13363899112b9a1181eb10e0754b583a63eb (diff)
downloadplus-bcd8bc4d0981ec25c04423eb1ed6425a28e911d4.tar.gz
plus-bcd8bc4d0981ec25c04423eb1ed6425a28e911d4.tar.bz2
plus-bcd8bc4d0981ec25c04423eb1ed6425a28e911d4.tar.xz
plus-bcd8bc4d0981ec25c04423eb1ed6425a28e911d4.zip
Move resourcemanager typedefs into separate files.
Diffstat (limited to 'src/resources/resourcemanager/resourcemanager.h')
-rw-r--r--src/resources/resourcemanager/resourcemanager.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/resources/resourcemanager/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h
index c436aed8b..553967a7e 100644
--- a/src/resources/resourcemanager/resourcemanager.h
+++ b/src/resources/resourcemanager/resourcemanager.h
@@ -23,9 +23,10 @@
#ifndef RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H
#define RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H
-#include <map>
+#include "resources/resourcefunctiontypes.h"
+#include "resources/resourcetypes.h"
+
#include <set>
-#include <string>
#include "localconsts.h"
@@ -36,14 +37,6 @@ struct SDL_RWops;
namespace ResourceManager
{
- typedef Resource *(*loader)(SDL_RWops *rw,
- const std::string &name);
- typedef Resource *(&generator)(const void *const data);
-
- typedef std::map<std::string, Resource*> Resources;
- typedef Resources::iterator ResourceIterator;
- typedef Resources::const_iterator ResourceCIterator;
-
/**
* Cleans up remaining resources, warning about resources
* that were still referenced.