Join modifications from branch BR_DEBUG_3_2_0b1

[modules/geom.git] / src / MeasureGUI / MeasureGUI_WhatisDlg.cxx

diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
index 0f30aaed21eda26090f16af205b8ca14bb2d078e..6ce2962320c09aeb64e7d2b1b6816a1959b39a5f 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -28,7 +28,6 @@
 
 #include "MeasureGUI_WhatisDlg.h"
 #include "MeasureGUI_1Sel1TextView_QTD.h"
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
 #include "GEOMBase.h"
 
 #include <TopTools_MapOfShape.hxx>
@@ -41,10 +40,12 @@
 #include <BRep_Tool.hxx>
 
 #include "utilities.h"
-#include "QAD_Desktop.h"
+#include "SUIT_Session.h"
+#include "SalomeApp_Tools.h"
 
 #include <qtextedit.h>
 #include <qlineedit.h>
+#include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
@@ -57,12 +58,12 @@
 //            The dialog will by default be modeless, unless you set 'modal' to
 //            TRUE to construct a modal dialog.
 //=================================================================================
-MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg( QWidget* parent, SALOME_Selection* Sel )
-: MeasureGUI_Skeleton( parent, "MeasureGUI_WhatisDlg", Sel )
+MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg( GeometryGUI* GUI, QWidget* parent )
+: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_WhatisDlg" )
 {
-  QPixmap image0( QAD_Desktop::getResourceManager()->loadPixmap(
+  QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap(
     "GEOM",tr( "ICON_DLG_WHATIS" ) ) );
-  QPixmap image1( QAD_Desktop::getResourceManager()->loadPixmap(
+  QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap(
     "GEOM",tr( "ICON_SELECT" ) ) );
 
   setCaption( tr( "GEOM_WHATIS_TITLE" ) );
@@ -83,8 +84,10 @@ MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg( QWidget* parent, SALOME_Selection* S
 
   /***************************************************************/
 
+  myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Whatis";
+
   /* Initialisation */
-  Init( Sel );
+  Init();
 }
 
 
@@ -101,11 +104,11 @@ MeasureGUI_WhatisDlg::~MeasureGUI_WhatisDlg()
 // function : Init()
 // purpose  :
 //=================================================================================
-void MeasureGUI_WhatisDlg::Init( SALOME_Selection* Sel )
+void MeasureGUI_WhatisDlg::Init()
 {
   mySelBtn = myGrp->PushButton1;
   mySelEdit = myGrp->LineEdit1;
-  MeasureGUI_Skeleton::Init( Sel );
+  MeasureGUI_Skeleton::Init();
 }
 
 //=================================================================================
@@ -135,7 +138,7 @@ bool MeasureGUI_WhatisDlg::getParameters( QString& theText )
     }
     catch( const SALOME::SALOME_Exception& e )
     {
-      QtCatchCorbaException( e );
+      SalomeApp_Tools::QtCatchCorbaException( e );
       return false;
     }