Remove dependency on XGUI

diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt
index 31bd93d10052182dedcc20077f9e4c7bbfcd692a..c1b22136e81a2ee841c4aa599481ed01095a0f5c 100644 (file)
--- a/src/CollectionPlugin/CMakeLists.txt
+++ b/src/CollectionPlugin/CMakeLists.txt
@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
   ../Events
   ../ModuleBase
   ../Config
-  ../XGUI
   ${CAS_INCLUDE_DIRS}
 )
 
@@ -52,7 +51,6 @@ SET(PROJECT_LIBRARIES
     GeomAlgoAPI
     GeomValidators
     ModuleBase
-       XGUI
 )
 
 ADD_DEFINITIONS(-DCOLLECTIONPLUGIN_EXPORTS ${CAS_DEFINITIONS})

diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
index 80f3e3d683e9f15afc10c6255e5f21b050c4689a..5c0040a916fcb79fc61d45b9c8d088f41ccff9c4 100644 (file)
--- a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
+++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
@@ -10,10 +10,7 @@
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_ISelection.h>
-
-#include <XGUI_Tools.h>
-#include <XGUI_Workshop.h>
-#include <XGUI_PropertyPanel.h>
+#include <ModuleBase_IPropertyPanel.h>
 
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_AttributeStringArray.h>
@@ -356,8 +353,7 @@ bool CollectionPlugin_WidgetField::eventFilter(QObject* theObject, QEvent* theEv
   } else if (theEvent->type() == QEvent::FocusIn) {
     QTableWidget* aTable = dynamic_cast<QTableWidget*>(theObject);
     if (aTable) {
-      XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop);
-      XGUI_PropertyPanel* aPanel = aWorkshop->propertyPanel();
+      ModuleBase_IPropertyPanel* aPanel = myWorkshop->propertyPanel();
       if (aPanel->activeWidget() != this) {
         myActivation = true;
         aPanel->activateWidget(this, false);