Clarification

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 511e230d0b7695e2ccef2cad75ac6cc2c89ae0d1..c653ff1ac9c1060471347a82556c036c50ce6c9a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -3046,7 +3046,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
   case SMESHOp::OpMGAdapt:
     {
       SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_nil();
-      SMESHGUI_AdaptDlg *aDlg = new SMESHGUI_AdaptDlg( this, theCommandID, aMesh);
+      SMESHGUI_AdaptDlg *objet = new SMESHGUI_AdaptDlg( this, theCommandID, aMesh);
     }
   // Adaptation - end
   case SMESHOp::OpSplitBiQuadratic:

diff --git a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
index a83311fdf7375b4fc3ff5dcd8d42e15cf4549c02..2e80bd079a4d15dbef4199022b15b22c8642e254 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
@@ -48,7 +48,7 @@ SMESHGUI_AdaptDlg::SMESHGUI_AdaptDlg( SMESHGUI* theModule,
                                       SMESH::SMESH_Mesh_ptr theMesh )
   : mySMESHGUI( theModule )
 {
-  bool ok = action( theCommandID ) ;
+  action( theCommandID ) ;
 }
 
 //=================================================================================
@@ -64,19 +64,19 @@ SMESHGUI_AdaptDlg::~SMESHGUI_AdaptDlg()
   * \param
   * \return bool OK/notOK
 */
-bool SMESHGUI_AdaptDlg::action (int theCommandID)
+void SMESHGUI_AdaptDlg::action (int theCommandID)
 //=======================================================================
 {
   std::cout  << "SMESHGUI_AdaptDlg::action avec theCommandID : " << theCommandID << std::endl;
 
 // Preferences
-  recupPreferences();
+//   recupPreferences();
 
 // Menus and actions
   bool ok =  OnGUIEvent (theCommandID) ;
   if ( ! ok ) INFOS("Erreur");
 
-  return ok ;
+  return ;
 }
 
 /*!

diff --git a/src/SMESHGUI/SMESHGUI_AdaptDlg.h b/src/SMESHGUI/SMESHGUI_AdaptDlg.h
index 4392340ea1363ffff54afe9b7c7368e46a001edc..8a7d6c28601d426d7db011144d282ac0a47c8f03 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AdaptDlg.h
+++ b/src/SMESHGUI/SMESHGUI_AdaptDlg.h
@@ -40,17 +40,15 @@ class SMESHGUI;
 // class    : SMESHGUI_AdaptDlg
 // purpose  :
 //=================================================================================
-class SMESHGUI_EXPORT SMESHGUI_AdaptDlg : public QDialog
+class SMESHGUI_EXPORT SMESHGUI_AdaptDlg : public QWidget
 {
-  Q_OBJECT
-
 public:
   SMESHGUI_AdaptDlg( SMESHGUI*,
                      int theCommandID,
                      SMESH::SMESH_Mesh_ptr = SMESH::SMESH_Mesh::_nil() );
   ~SMESHGUI_AdaptDlg();
 
-  virtual bool action (int theCommandID);
+  void action (int theCommandID);
   virtual bool OnGUIEvent (int theCommandID);
 
 //   static ADAPT::ADAPT_Gen_var InitAdaptGen(SalomeApp_Application*);