Some fixes in USER_IMPL.

[stg.git] / projects / stargazer / store_loader.h

diff --git a/projects/stargazer/store_loader.h b/projects/stargazer/store_loader.h
index 1f624e1ad34b9e83052db0c93f2ea66c9cb6d684..5245eb572f8c42f8091edc55657ee0fe30238faa 100644 (file)
--- a/projects/stargazer/store_loader.h
+++ b/projects/stargazer/store_loader.h
@@ -33,24 +33,28 @@
 
 #include <string>
 
 
 #include <string>
 

-#include "module_settings.h"
-#include "noncopyable.h"
+#include "stg/module_settings.h"
+#include "stg/noncopyable.h"

 
 class STORE;
 
 class STORE;

-class SETTINGS;
+class SETTINGS_IMPL;

 
 class STORE_LOADER : private NONCOPYABLE {
 public:
 
 class STORE_LOADER : private NONCOPYABLE {
 public:

-    STORE_LOADER(const SETTINGS & settings);
+    STORE_LOADER(const SETTINGS_IMPL & settings);

     ~STORE_LOADER();
 
     bool Load();
     bool Unload();
 
     ~STORE_LOADER();
 
     bool Load();
     bool Unload();
 

-    STORE * GetStore() { return plugin; }
+    STORE & GetStore() { return *plugin; }

 
     const std::string & GetStrError() const { return errorStr; }
 
     const std::string & GetStrError() const { return errorStr; }

+

 private:
 private:

+    STORE_LOADER(const STORE_LOADER & rvalue);
+    STORE_LOADER & operator=(const STORE_LOADER & rvalue);
+

     bool isLoaded;
     void * handle;
     STORE * plugin;
     bool isLoaded;
     void * handle;
     STORE * plugin;