Merge branch 'master' into gni/adaptation

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

diff --git a/src/SMESHGUI/SMESHGUI_MG_ADAPTDRIVER.h b/src/SMESHGUI/SMESHGUI_MG_ADAPTDRIVER.h
index 7f2e3ee6f3d3be8a8dc1ec82e6d881bd3c5031fb..20e09dd956131b1891ed15cace105efd6821f120 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MG_ADAPTDRIVER.h
+++ b/src/SMESHGUI/SMESHGUI_MG_ADAPTDRIVER.h
@@ -43,10 +43,9 @@
 #include <med.h>
 #include <QObject>
 // model
-//~#include "MG_ADAPT.h"
 #include "MG_ADAPTGUI.hxx"
-#include "MG_ADAPT.hxx"
 
+#include CORBA_SERVER_HEADER(MG_ADAPT)
 
 class SUIT_ViewWindow;
 class SUIT_Desktop;
@@ -103,29 +102,13 @@ Handle(SALOME_InteractiveObject) firstIObject();
 bool createAndPublishMed(QString fileName);
 bool createMgAdaptObject(MgAdapt* myMgAdapt = 0);
 
-class SMESHGUI_EXPORT SMESHGUI_MG_AdaptComputeDlg_QThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    SMESHGUI_MG_AdaptComputeDlg_QThread(MgAdapt* model);
-    int                   result();
-    void                   cancel();
-protected:
-    void run();
-
-private:
-
-    MgAdapt* model;
-    int                  myResult;
-};
 
 class  SMESHGUI_MG_ADAPTDRIVER : public SMESHGUI_MgAdaptDlg
 {
     Q_OBJECT;
 
 public :
-    SMESHGUI_MG_ADAPTDRIVER( SMESHGUI*, MgAdapt*, bool isCreation = true );
+    SMESHGUI_MG_ADAPTDRIVER( SMESHGUI*, SMESH::MG_ADAPT_ptr, bool isCreation = true );
     void setMyMesh(SMESH::SMESH_Mesh_var);
     SMESH::SMESH_Mesh_var getMyMesh() ;
 
@@ -205,10 +188,10 @@ private slots:
 
     void exportMED(const char* );
 
-    virtual bool clickOnApply();
-    virtual void                   clickOnOk();
-    virtual void           clickOnHelp();
-    //~void                   SelectionIntoArgument();
+    virtual bool PushOnApply();
+    virtual void PushOnOK();
+    virtual void PushOnHelp();
+
     void                   deactivateActiveDialog();
     void                   activateThisDialog();
     void                   onConstructor( int );