From 913c682099fe621fe7c506b2b755ff826630a570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rald=20NICOLAS?= Date: Tue, 9 Jun 2020 11:25:48 +0200 Subject: [PATCH] Clarification --- src/SMESHGUI/SMESHGUI.cxx | 2 +- src/SMESHGUI/SMESHGUI_AdaptDlg.cxx | 8 ++++---- src/SMESHGUI/SMESHGUI_AdaptDlg.h | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 511e230d0..c653ff1ac 100644 --- 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 a83311fdf..2e80bd079 100644 --- 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 4392340ea..8a7d6c286 100644 --- 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*);