...

[cpPlugins.git] / lib / cpBaseQtApplication / MainWindow.h

diff --git a/lib/cpBaseQtApplication/MainWindow.h b/lib/cpBaseQtApplication/MainWindow.h
index 53aebf287d2f1abedfcf9795c569de28fefbf6d4..2e967d9d526e8a1b60e6fa69e31e054b5ff2a927 100644 (file)
--- a/lib/cpBaseQtApplication/MainWindow.h
+++ b/lib/cpBaseQtApplication/MainWindow.h
@@ -4,7 +4,7 @@
 #include <cpBaseQtApplication_Export.h>
 #include <QMainWindow>
 #include <QMessageBox>
-#include <cpPlugins/Interface/Plugins.h>
+#include <cpPlugins/Interface/Loader.h>
 #include <cpPlugins/Interface/Workspace.h>
 #include <cpBaseQtApplication/Blocker.h>
 
@@ -64,7 +64,7 @@ namespace cpBaseQtApplication
     typedef MainWindow  Self;
     typedef QMainWindow Superclass;
 
-    typedef cpPlugins::Interface::Plugins   TPlugins;
+    typedef cpPlugins::Interface::Loader    TLoader;
     typedef cpPlugins::Interface::Workspace TWorkspace;
 
   public:
@@ -74,8 +74,8 @@ namespace cpBaseQtApplication
       );
     virtual ~MainWindow( );
 
-    TWorkspace* workspace( const std::string& wname );
-    const TWorkspace* workspace( const std::string& wname ) const;
+    TWorkspace* workspace( );
+    const TWorkspace* workspace( ) const;
 
     Pipeline::Canvas* canvas( );
     const Pipeline::Canvas* canvas( ) const;
@@ -105,13 +105,9 @@ namespace cpBaseQtApplication
     void _loadPluginsFromPath( const std::string& path );
     void _loadPluginsFromPath( );
 
-    void _clearWorkspaces( );
+    void _clearWorkspace( );
 
-    virtual void _addWorkspace( const std::string& name );
-    void _addWorkspace( );
-
-    void _saveWorkspace( const std::string& wname, const std::string& fname );
-    void _saveWorkspace( const std::string& wname, bool force );
+    void _saveWorkspace( const std::string& fname );
     void _saveWorkspace( );
 
     void _loadWorkspace( const std::string& fname );
@@ -120,13 +116,12 @@ namespace cpBaseQtApplication
     void _actorsProperties( );
 
   protected:
-    Blocker           m_Blocker;
-    std::string       m_RunPath;
-    TPlugins::Pointer m_Plugins;
-    std::string       m_LastSaveFileName;
-    std::map< std::string, TWorkspace::Pointer > m_Workspaces;
+    Blocker             m_Blocker;
+    std::string         m_RunPath;
+    TLoader             m_Loader;
+    std::string         m_LastSaveFileName;
+    TWorkspace::Pointer m_Workspace;
 
-    bool        m_SingleWorkspace;
     std::string m_BaseWindowTitle;
 
     Pipeline::Canvas*                        m_Canvas;