From 2942cba062d9c38814d63a719cdd0fc312f11825 Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 10 Oct 2012 08:42:09 +0000 Subject: [PATCH] Avoid "GROUP" redefinition on win32: add 'MeshObjectType'enum to namespace SMESH --- src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx | 2 +- src/GUI/BLSURFPluginGUI_HypothesisCreator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx index 4884edf..981bada 100644 --- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx @@ -440,7 +440,7 @@ bool EnforcedTreeWidgetDelegate::vertexExists(QAbstractItemModel *model, // // // BLSURFPluginGUI_ObjectReferenceParamWdg::BLSURFPluginGUI_ObjectReferenceParamWdg -// ( MeshObjectType objType, QWidget* parent, bool multiSelection ) +// ( SMESH::MeshObjectType objType, QWidget* parent, bool multiSelection ) // : StdMeshersGUI_ObjectReferenceParamWdg( objType, parent, multiSelection ) // { // init(); diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h index efd475a..6149c53 100644 --- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h +++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h @@ -149,7 +149,7 @@ typedef struct // BLSURFPluginGUI_ObjectReferenceParamWdg( SUIT_SelectionFilter* filter, // QWidget* parent, // bool multiSelection=false); -// BLSURFPluginGUI_ObjectReferenceParamWdg( MeshObjectType objType, +// BLSURFPluginGUI_ObjectReferenceParamWdg( SMESH::MeshObjectType objType, // QWidget* parent, // bool multiSelection=false); // ~BLSURFPluginGUI_ObjectReferenceParamWdg(); -- 2.30.2