X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPipelineEditor%2FBaseQtMainWindow.h;h=fbcde2873e80ca3ac673c0ecbaa845dc4a54745a;hb=24d0c2ad34de2cbd89fed76058f2995cdf81d239;hp=430de43f924a3a684c924b1711d2fa5bec2e771c;hpb=25bbcded53b31313762477b2f8dde29b5a845a34;p=cpPlugins.git diff --git a/lib/cpPipelineEditor/BaseQtMainWindow.h b/lib/cpPipelineEditor/BaseQtMainWindow.h index 430de43..fbcde28 100644 --- a/lib/cpPipelineEditor/BaseQtMainWindow.h +++ b/lib/cpPipelineEditor/BaseQtMainWindow.h @@ -1,10 +1,7 @@ -#ifndef __CPPLUGINS__BASEQTMAINWINDOW__H__ -#define __CPPLUGINS__BASEQTMAINWINDOW__H__ - -#include - -#ifdef cpPlugins_QT4 +#ifndef __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__ +#define __CPPIPELINEEDITOR__BASEQTMAINWINDOW__H__ +#include #include #include #include @@ -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$