cade lab fixes

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

diff --git a/src/Moof/Resource.hh b/src/Moof/Resource.hh
index 2740fc31a136add04d6bcc81f7a21ae37aa878bc..671aeb65bc3329c69666ba31a0451d7ff1913c52 100644 (file)
--- a/src/Moof/Resource.hh
+++ b/src/Moof/Resource.hh
@@ -37,8 +37,6 @@
 #include <string>
 #include <vector>
 
-#include <Moof/Exception.hh>
-
 
 namespace Mf {
 
@@ -51,7 +49,7 @@ class Resource
 {
 public:
 
-       virtual ~Resource();
+       virtual ~Resource() {}
 
 
        /**
@@ -59,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.
@@ -70,21 +69,9 @@ public:
 
        static std::string getPath(const std::string& name);
 
-
-       struct Exception : public Mf::Exception
-       {
-               explicit Exception(unsigned error) :
-                       Mf::Exception(error) {}
-
-               void raise()
-               {
-                       throw *this;
-               }
-       };
-
 private:
 
-       static std::vector<std::string> searchPaths_;
+       static std::vector<std::string> gSearchPaths;
 };