From e18069c6ce0a9e81cb44bc57c2b91d655333c39b Mon Sep 17 00:00:00 2001 From: vsv Date: Wed, 14 Dec 2016 10:54:47 +0300 Subject: [PATCH] Remove dependency on XGUI --- src/CollectionPlugin/CMakeLists.txt | 3 --- src/CollectionPlugin/CollectionPlugin_WidgetField.cpp | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt index 653aeb8e6..00c353de7 100644 --- a/src/CollectionPlugin/CMakeLists.txt +++ b/src/CollectionPlugin/CMakeLists.txt @@ -53,7 +53,6 @@ INCLUDE_DIRECTORIES( ../Events ../ModuleBase ../Config - ../XGUI ${CAS_INCLUDE_DIRS} ) @@ -64,8 +63,6 @@ SET(PROJECT_LIBRARIES GeomAlgoAPI GeomValidators ModuleBase - XGUI - ${QT_LIBRARIES} ) ADD_DEFINITIONS(-DCOLLECTIONPLUGIN_EXPORTS ${CAS_DEFINITIONS}) diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp index 80f3e3d68..5c0040a91 100644 --- a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp +++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp @@ -10,10 +10,7 @@ #include #include #include - -#include -#include -#include +#include #include #include @@ -356,8 +353,7 @@ bool CollectionPlugin_WidgetField::eventFilter(QObject* theObject, QEvent* theEv } else if (theEvent->type() == QEvent::FocusIn) { QTableWidget* aTable = dynamic_cast(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); -- 2.39.2