Some more BSD-related issues.

[stg.git] / stargazer / store_loader.h

diff --git a/stargazer/store_loader.h b/stargazer/store_loader.h
index b38a46ee94fcbf85d2fd79a7f115e2bc474040ec..c187b540670658e63aeda62deed9263bbe4e1744 100644 (file)
--- a/stargazer/store_loader.h
+++ b/stargazer/store_loader.h
@@ -18,49 +18,40 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
-/*
- $Revision: 1.3 $
- $Date: 2010/03/04 12:24:19 $
- $Author: faust $
- */
-
-/*
- *  Header file for RAII store plugin loader
- */
-
-#ifndef __STORE_LOADER_H__
-#define __STORE_LOADER_H__
+#pragma once
 
 #include "stg/module_settings.h"
-#include "stg/noncopyable.h"
 
 #include <string>
 
-class STORE;
-class SETTINGS_IMPL;
+namespace STG
+{
+
+struct Store;
+class SettingsImpl;
 
-class STORE_LOADER : private NONCOPYABLE {
-public:
-    explicit STORE_LOADER(const SETTINGS_IMPL & settings);
-    ~STORE_LOADER();
+class StoreLoader {
+    public:
+        explicit StoreLoader(const SettingsImpl& settings) noexcept;
+        ~StoreLoader();
 
-    bool Load();
-    bool Unload();
+        StoreLoader(const StoreLoader&) = delete;
+        StoreLoader& operator=(const StoreLoader&) = delete;
 
-    STORE & GetStore() { return *plugin; }
+        bool load() noexcept;
+        bool unload() noexcept;
 
-    const std::string & GetStrError() const { return errorStr; }
+        Store& get() noexcept { return *plugin; }
 
-private:
-    STORE_LOADER(const STORE_LOADER & rvalue);
-    STORE_LOADER & operator=(const STORE_LOADER & rvalue);
+        const std::string& GetStrError() const noexcept { return errorStr; }
 
-    bool isLoaded;
-    void * handle;
-    STORE * plugin;
-    std::string errorStr;
-    MODULE_SETTINGS storeSettings;
-    std::string pluginFileName;
+    private:
+        bool isLoaded;
+        void* handle;
+        Store* plugin;
+        std::string errorStr;
+        ModuleSettings storeSettings;
+        std::string pluginFileName;
 };
 
-#endif
+}