...

[cpPlugins.git] / lib / cpPipelineEditor / BaseQtMainWindow.h

diff --git a/lib/cpPipelineEditor/BaseQtMainWindow.h b/lib/cpPipelineEditor/BaseQtMainWindow.h
index 430de43f924a3a684c924b1711d2fa5bec2e771c..fbcde2873e80ca3ac673c0ecbaa845dc4a54745a 100644 (file)
--- a/lib/cpPipelineEditor/BaseQtMainWindow.h
+++ b/lib/cpPipelineEditor/BaseQtMainWindow.h
@@ -1,10 +1,7 @@
-#ifndef __CPPLUGINS__BASEQTMAINWINDOW__H__
-#define __CPPLUGINS__BASEQTMAINWINDOW__H__
-
-#include <cpPlugins/Config.h>
-
-#ifdef cpPlugins_QT4
+#ifndef __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__
+#define __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__
 
+#include <cpPipelineEditor/cpPipelineEditor_Export.h>
 #include <QMainWindow>
 #include <cpPlugins/Interface.h>
 #include <cpPlugins/Workspace.h>
@@ -16,17 +13,15 @@ namespace cpExtensions
     class SimpleMPRWidget;
   }
 }
+class QTreeWidget;
+
 namespace cpPipelineEditor
 {
   class Editor;
-}
-class QTreeWidget;
 
-namespace cpPlugins
-{
   /**
    */
-  class cpPlugins_EXPORT BaseQtMainWindow
+  class cpPipelineEditor_EXPORT BaseQtMainWindow
     : public QMainWindow
   {
     Q_OBJECT;
@@ -76,20 +71,18 @@ namespace cpPlugins
     void _ExecFilter( const std::string& filter_name );
 
   protected:
-    QApplication* m_Application;
-    _TBlocker     m_Blocker;
-    Workspace     m_Workspace;
-    Interface     m_Interface;
-    std::string   m_PluginsPath;
+    QApplication*        m_Application;
+    _TBlocker            m_Blocker;
+    cpPlugins::Workspace m_Workspace;
+    cpPlugins::Interface m_Interface;
+    std::string          m_PluginsPath;
 
     QTreeWidget* m_TreeWidget;
-    cpPipelineEditor::Editor* m_Editor;
+    Editor*      m_Editor;
   };
 
 } // ecapseman
 
-#endif // cpPlugins_QT4
-
-#endif // __CPPLUGINS__BASEQTMAINWINDOW__H__
+#endif // __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__
 
 // eof - $RCSfile$