From: nds <nds@opencascade.com>
Date: Thu, 15 Dec 2016 12:13:10 +0000 (+0300)
Subject: Porting to SALOME_8.2.0 : SHAPERGUI module
X-Git-Tag: V_2.7.0~351^2~55^2~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=eec9547c33c4e2b1059e40c7da4635ecfa6a2a52;p=modules%2Fshaper.git

Porting to SALOME_8.2.0 : SHAPERGUI module
---

diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp
index bea2a1fad..7e41d32b6 100644
--- a/src/SHAPERGUI/SHAPERGUI.cpp
+++ b/src/SHAPERGUI/SHAPERGUI.cpp
@@ -235,7 +235,7 @@ bool SHAPERGUI::activateModule(SUIT_Study* theStudy)
       bool aFound = false;
       for (aLIt.Initialize(aList); aLIt.More(); aLIt.Next()) {
         anAISIO = aLIt.Value();
-        if (anAISIO.Access() == aAIS.Access()) {
+        if (anAISIO.get() == aAIS.get()) {
           aFound = true;
           break;
         }
@@ -438,7 +438,7 @@ QAction* SHAPERGUI::addFeature(const QString& theWBName, const QString& theId,
   myActionsList.append(theId);
   SUIT_Desktop* aDesk = application()->desktop();
   int aKeys = 0;
-  for (unsigned int i = 0; i < theKeys.count(); i++)
+  for (int i = 0; i < theKeys.count(); i++)
     aKeys += theKeys[i];
   QAction* aAction = createAction(aId, theTip, theIcon, theTitle, theTip, aKeys, aDesk,
                                   isCheckable);
@@ -506,7 +506,7 @@ QAction* SHAPERGUI::addDesktopCommand(const QString& theId, const QString& theTi
   myActionsList.append(theId);
   SUIT_Desktop* aDesk = application()->desktop();
   int aKeys = 0;
-  for (unsigned int i = 0; i < theKeys.count(); i++)
+  for (int i = 0; i < theKeys.count(); i++)
     aKeys += theKeys[i];
   QAction* aAction = createAction(aId, theTip, theIcon, theTitle, theTip, aKeys, aDesk,
                                   isCheckable);
diff --git a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
index 15027a581..4d978aeb8 100644
--- a/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
+++ b/src/SHAPERGUI/SHAPERGUI_SalomeViewer.cpp
@@ -400,7 +400,7 @@ bool SHAPERGUI_SalomeViewer::hasSelectionFilter(const Handle(SelectMgr_Filter)&
     const SelectMgr_ListOfFilter& aFilters = aContext->Filters();
     SelectMgr_ListIteratorOfListOfFilter aIt(aFilters);
     for (; aIt.More() && !aFoundFilter; aIt.Next()) {
-      aFoundFilter = theFilter.Access() == aIt.Value().Access();
+      aFoundFilter = theFilter.get() == aIt.Value().get();
     }
   }
   return aFoundFilter;
diff --git a/src/XGUI/XGUI_ObjectsBrowser.cpp b/src/XGUI/XGUI_ObjectsBrowser.cpp
index 2ac7f97d9..173e4e8fb 100644
--- a/src/XGUI/XGUI_ObjectsBrowser.cpp
+++ b/src/XGUI/XGUI_ObjectsBrowser.cpp
@@ -22,7 +22,9 @@
 
 #ifdef WIN32
 #ifdef HAVE_SALOME
-#include <QWindowsStyle>
+// PORTING_TO_SALOME_8
+//#include <QWindowsStyle>
+#include <QCommonStyle>
 #endif
 #endif
 
@@ -70,7 +72,7 @@ XGUI_DataTree::XGUI_DataTree(QWidget* theParent)
 {
 #ifdef WIN32
 #ifdef HAVE_SALOME
-  setStyle(new QWindowsStyle());
+  setStyle(new QCommonStyle());
 #else
   myStyle = new XGUI_TreeViewStyle();
   setStyle(myStyle);