cade lab fixes

[chaz/yoink] / src / Moof / Resource.hh

diff --git a/src/Moof/Resource.hh b/src/Moof/Resource.hh
index 716e906e03f4c1f53d1ae0b3ba44ace3b3f3ba0b..671aeb65bc3329c69666ba31a0451d7ff1913c52 100644 (file)
--- a/src/Moof/Resource.hh
+++ b/src/Moof/Resource.hh
@@ -34,7 +34,6 @@
  * Interface for textures, sounds, and other types of resources.
  */
 
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -49,13 +48,8 @@ namespace Mf {
 class Resource
 {
 public:
-       struct Exception : public std::runtime_error
-       {
-               explicit Exception(const std::string& what_arg) :
-                       std::runtime_error(what_arg) {}
-       };
 
-       virtual ~Resource();
+       virtual ~Resource() {}
 
 
        /**
@@ -63,7 +57,8 @@ public:
         * @param directory Path to a directory.
         */
 
-       static void addSearchPath(const std::string& directory);
+       static void addSearchPaths(const std::string& path);
+       static void addSearchPaths(const std::vector<std::string>& path);
 
        /**
         * Get the path to a resource of a given name.
@@ -72,10 +67,11 @@ public:
         * @return The first path found which resolves to a file.
         */
 
-       static std::string getPathToResource(const std::string& name);
+       static std::string getPath(const std::string& name);
 
 private:
-       static std::vector<std::string> searchPaths_;
+
+       static std::vector<std::string> gSearchPaths;
 };