Merge from V5_1_main branch 24/11/2010

[plugins/ghs3dplugin.git] / src / GUI / GHS3DPluginGUI_HypothesisCreator.cxx

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
index a2857938281ab89d603f351bfe6797df8276319d..a282bc3ddd3d1bb1191714b50f8cd31fc92d1dfa 100644 (file)
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2004-2008  CEA/DEN, EDF R&D
+//  Copyright (C) 2004-2010  CEA/DEN, EDF R&D
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -16,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  GHS3DPlugin GUI: GUI for plugged-in mesher GHS3DPlugin
 //  File   : GHS3DPluginGUI_HypothesisCreator.cxx
 //  Author : Michael Zorin
@@ -115,6 +116,7 @@ namespace {
       return (int) ( 0.7 * totMB );
     }
 #endif
+    return 0;
   }
 }
 
@@ -469,8 +471,8 @@ bool GHS3DPluginGUI_HypothesisCreator::checkParams(QString& msg) const
 
   if ( !QFileInfo( myWorkingDir->text().trimmed() ).isWritable() ) {
     SUIT_MessageBox::warning( dlg(),
-                             tr( "SMESH_WRN_WARNING" ),
-                             tr( "GHS3D_PERMISSION_DENIED" ) );
+                              tr( "SMESH_WRN_WARNING" ),
+                              tr( "GHS3D_PERMISSION_DENIED" ) );
     return false;
   }
 
@@ -490,10 +492,10 @@ void GHS3DPluginGUI_HypothesisCreator::retrieveParams() const
   myOptimizationLevelCombo         ->setCurrentIndex( data.myOptimizationLevel );
   myMaximumMemoryCheck             ->setChecked    ( data.myMaximumMemory > 0 );
   myMaximumMemorySpin              ->setValue      ( qMax( data.myMaximumMemory,
-                                                                                        myMaximumMemorySpin->minimum() ));
+                                                           myMaximumMemorySpin->minimum() ));
   myInitialMemoryCheck             ->setChecked    ( data.myInitialMemory > 0 );
   myInitialMemorySpin              ->setValue      ( qMax( data.myInitialMemory,
-                                                                                        myInitialMemorySpin->minimum() ));
+                                                           myInitialMemorySpin->minimum() ));
   myWorkingDir                     ->setText       ( data.myWorkingDir );
   myKeepFiles                      ->setChecked    ( data.myKeepFiles );
   myVerboseLevelSpin               ->setValue      ( data.myVerboseLevel );