From bcd8bc4d0981ec25c04423eb1ed6425a28e911d4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 8 Apr 2017 23:36:03 +0300
Subject: Move resourcemanager typedefs into separate files.

---
 src/resources/resourcemanager/resourcemanager.h | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/resources/resourcemanager/resourcemanager.h')

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.
-- 
cgit v1.2.3-60-g2f50