Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / XGUI / XGUI_Preferences.cpp

diff --git a/src/XGUI/XGUI_Preferences.cpp b/src/XGUI/XGUI_Preferences.cpp
index ed3782b110d0d5cdfddf7b60df4eb06ea878b873..635462d89a999eb020f7fbb3ea476dd5e7348606 100644 (file)
--- a/src/XGUI/XGUI_Preferences.cpp
+++ b/src/XGUI/XGUI_Preferences.cpp
@@ -270,14 +270,15 @@ void XGUI_PreferencesDlg::modified(XGUI_Prefs& theModified) const
 void XGUI_PreferencesDlg::onDefault()
 {
   // reset main resources
-  QtxResourceMgr::WorkingMode aPrev = myPreferences->resourceMgr()->setWorkingMode
-                                               (QtxResourceMgr::IgnoreUserValues);
+#ifdef SALOME_750 // until SALOME 7.5.0 is released
+  QtxResourceMgr::WorkingMode aPrev =
+      myPreferences->resourceMgr()->setWorkingMode(QtxResourceMgr::IgnoreUserValues);
   myPreferences->retrieve();
   myPreferences->resourceMgr()->setWorkingMode(aPrev);
-
+#endif
   // reset plugin's resources
   XGUI_Preferences::resetConfig();
-  XGUI_Preferences::updateResourcesByConfig(false);
+  XGUI_Preferences::updateResourcesByConfig();
 
   myPreferences->retrieve();
 }