Merge remote-tracking branch 'origin/master' into gni/adaptation

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_AdaptDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_AdaptDlg.h b/src/SMESHGUI/SMESHGUI_AdaptDlg.h
index 4392340ea1363ffff54afe9b7c7368e46a001edc..1231b067e4a84471c9f11902f1ceaca3f9e89fcc 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*);
@@ -63,7 +61,7 @@ private slots:
 
 private:
 
-  void recupPreferences();
+//   void recupPreferences();
   SMESHGUI*                     mySMESHGUI;              /* Current SMESHGUI object */
 
   QString _ObjectName;