From: mkr <mkr@opencascade.com>
Date: Tue, 10 Jul 2007 12:26:46 +0000 (+0000)
Subject: Porting to Qt4.
X-Git-Tag: snapshot_171207~26
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d5db2b50f4d998ea171767bc358b34dcf529d858;p=modules%2Fgeom.git

Porting to Qt4.
---

diff --git a/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx
index a9d443817..5557896a2 100644
--- a/src/BuildGUI/BuildGUI.cxx
+++ b/src/BuildGUI/BuildGUI.cxx
@@ -29,7 +29,6 @@
 #include "BuildGUI.h"
 
 #include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
 
 #include "SalomeApp_Application.h"
 
diff --git a/src/BuildGUI/BuildGUI.pro b/src/BuildGUI/BuildGUI.pro
new file mode 100644
index 000000000..6dd3de7c5
--- /dev/null
+++ b/src/BuildGUI/BuildGUI.pro
@@ -0,0 +1,45 @@
+TEMPLATE = lib
+TARGET = BuildGUI
+DESTDIR = ../../lib
+MOC_DIR = ../../moc
+OBJECTS_DIR = ../../obj/$$TARGET
+
+QT_INCLUDES = $$(QTDIR)/include $$(QTDIR)/include/QtCore $$(QTDIR)/include/QtGui $$(QTDIR)/include/QtOpenGL $$(QTDIR)/include/QtXml
+
+VTK_INCLUDES = $$(VTKHOME)/include/vtk
+
+CASROOT = $$(CASROOT)
+CAS_CPPFLAGS = $${CASROOT}/inc
+
+PYTHON_INCLUDES = $$(PYTHONHOME)/include/python2.4
+
+BOOST_CPPFLAGS = $$(BOOSTDIR)/include
+
+KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome
+
+GUI_CXXFLAGS = $$(GUI_ROOT_DIR)/include/salome
+
+CORBA_INCLUDES = $$(OMNIORBDIR)/include $$(OMNIORBDIR)/include/omniORB4 $$(OMNIORBDIR)/include/COS
+
+INCLUDEPATH += $${QT_INCLUDES} $${VTK_INCLUDES} $${CAS_CPPFLAGS} $${PYTHON_INCLUDES} $${BOOST_CPPFLAGS} $${KERNEL_CXXFLAGS} $${GUI_CXXFLAGS} $${CORBA_INCLUDES} ../GEOMGUI ../DlgRef ../GEOMBase ../OBJECT ../GEOMClient ../GEOMImpl ../GEOMFiltersSelection $$(GEOM_ROOT_DIR)/idl $$(GEOM_ROOT_DIR)/salome_adm/unix
+
+LIBS += -L$$(GEOM_ROOT_DIR)/lib -lGEOMFiltersSelection -lGEOMBase
+
+CONFIG -= debug release debug_and_release
+CONFIG += qt thread debug dll shared
+
+win32:DEFINES += WIN32 
+DEFINES += BUILDGUI_EXPORTS OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS OMNIORB_VERSION=4 __x86__ __linux__ COMP_CORBA_DOUBLE COMP_CORBA_LONG
+
+SOURCES  = BuildGUI.cxx
+SOURCES += BuildGUI_EdgeDlg.cxx
+SOURCES += BuildGUI_WireDlg.cxx
+SOURCES += BuildGUI_FaceDlg.cxx
+SOURCES += BuildGUI_ShellDlg.cxx
+SOURCES += BuildGUI_SolidDlg.cxx
+SOURCES += BuildGUI_CompoundDlg.cxx
+
+includes.files = $$HEADERS
+includes.path = ../../include
+
+INSTALLS += includes
diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
index e8dfbb88a..d0b3ebb81 100644
--- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
@@ -29,12 +29,14 @@
 #include "BuildGUI_CompoundDlg.h"
 #include "GEOMImpl_Types.hxx"
 
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
+
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
-#include <qlabel.h>
-
 //=================================================================================
 // class    : BuildGUI_CompoundDlg()
 // purpose  : Constructs a BuildGUI_CompoundDlg which is a child of 'parent', with the 
@@ -43,28 +45,33 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                           const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+                                           const char* name, bool modal, Qt::WindowFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_COMPOUND_TITLE"));
+  setWindowTitle(tr("GEOM_COMPOUND_TITLE"));
 
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_COMPOUND"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupShapes = new Ui::DlgRef_1Sel_QTD();
+  QWidget* aGroupShapesWidget = new QWidget(this);
+  GroupShapes->setupUi(aGroupShapesWidget);
+  aGroupShapesWidget->setObjectName("GroupShapes");
 
-  GroupShapes = new DlgRef_1Sel_QTD(this, "GroupShapes");
   GroupShapes->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupShapes->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupShapes->PushButton1->setPixmap(image1);
+  GroupShapes->PushButton1->setIcon(image1);
   GroupShapes->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupShapes, 2, 0);
+  gridLayout1->addWidget(aGroupShapesWidget, 2, 0);
   /***************************************************************/
 
   setHelpFileName("compound.htm");
@@ -105,7 +112,7 @@ void BuildGUI_CompoundDlg::Init()
 
   globalSelection( GEOM_ALLSHAPES );
 
-  initName( tr( "GEOM_COMPOUND" ) );
+  initName( tr( "GEOM_COMPOUND" ).toStdString().c_str() );
 }
 
 
diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h
index 31182622c..58f9b1ca9 100644
--- a/src/BuildGUI/BuildGUI_CompoundDlg.h
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.h
@@ -43,7 +43,7 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_CompoundDlg : public GEOMBase_Skeleton
 
 public:
     BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-			 const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+			 const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~BuildGUI_CompoundDlg();
 
 protected:
@@ -59,7 +59,7 @@ private:
     GEOM::ListOfGO myShapes;
     bool           myOkShapes;
 
-    DlgRef_1Sel_QTD* GroupShapes;
+    Ui::DlgRef_1Sel_QTD* GroupShapes;
     
 private slots:
     void ClickOnOk();
diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
index 873efc3a6..1a124b8c6 100644
--- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
@@ -28,18 +28,16 @@
 
 #include "BuildGUI_EdgeDlg.h"
 
-#include <BRepBuilderAPI_MakeEdge.hxx>
-#include <Precision.hxx>
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
 
-#include "utilities.h"
 #include "GEOMImpl_Types.hxx"
 
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
-#include <qlabel.h>
-
 //=================================================================================
 // class    : BuildGUI_EdgeDlg()
 // purpose  : Constructs a BuildGUI_EdgeDlg which is a child of 'parent', with the 
@@ -48,32 +46,37 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BuildGUI_EdgeDlg::BuildGUI_EdgeDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                   const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+                                   const char* name, bool modal, Qt::WindowFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_EDGE")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_EDGE_TITLE"));
+  setWindowTitle(tr("GEOM_EDGE_TITLE"));
 
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_EDGE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupPoints = new Ui::DlgRef_2Sel_QTD();
+  QWidget* aGroupPointsWidget = new QWidget(this);
+  GroupPoints->setupUi(aGroupPointsWidget);
+  aGroupPointsWidget->setObjectName("GroupPoints");
 
-  GroupPoints = new DlgRef_2Sel_QTD(this, "GroupPoints");
   GroupPoints->GroupBox1->setTitle(tr("GEOM_POINTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_POINT_I").arg("1"));
   GroupPoints->TextLabel2->setText(tr("GEOM_POINT_I").arg("2"));
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->PushButton2->setIcon(image1);
   
   GroupPoints->LineEdit1->setReadOnly( true );
   GroupPoints->LineEdit2->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  gridLayout1->addWidget(aGroupPointsWidget, 2, 0);
   /***************************************************************/
 
   setHelpFileName("edge.htm");
@@ -121,7 +124,7 @@ void BuildGUI_EdgeDlg::Init()
   connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
 	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
 
-  initName( tr( "GEOM_EDGE") );
+  initName( tr( "GEOM_EDGE").toStdString().c_str() );
 }
 
 
diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h
index 3a7b7b2b5..c373769e1 100644
--- a/src/BuildGUI/BuildGUI_EdgeDlg.h
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.h
@@ -43,7 +43,7 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_EdgeDlg : public GEOMBase_Skeleton
 
 public:
     BuildGUI_EdgeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-		     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+		     const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~BuildGUI_EdgeDlg();
 
 protected:
@@ -60,7 +60,7 @@ private:
     bool myOkPoint1;   /* true when myPoint is defined */    
     bool myOkPoint2;
     
-    DlgRef_2Sel_QTD* GroupPoints;
+    Ui::DlgRef_2Sel_QTD* GroupPoints;
 
 private slots:
     void ClickOnOk();
diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx
index 953c54f8f..1bd391fa4 100644
--- a/src/BuildGUI/BuildGUI_FaceDlg.cxx
+++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx
@@ -30,14 +30,14 @@
 #include "GEOMImpl_Types.hxx"
 #include "TColStd_MapOfInteger.hxx"
 
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
+
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
-//Qt includes
-#include <qcheckbox.h>
-#include <qlabel.h>
-
 using namespace std;
 
 //=================================================================================
@@ -48,28 +48,33 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BuildGUI_FaceDlg::BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                   const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+                                   const char* name, bool modal, Qt::WindowFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_FACE")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_FACE_TITLE"));
+  setWindowTitle(tr("GEOM_FACE_TITLE"));
 
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_FACE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupWire = new Ui::DlgRef_1Sel1Check_QTD();
+  QWidget* aGroupWireWidget = new QWidget(this);
+  GroupWire->setupUi(aGroupWireWidget);
+  aGroupWireWidget->setObjectName("GroupWire");
 
-  GroupWire = new DlgRef_1Sel1Check_QTD(this, "GroupWire");
   GroupWire->GroupBox1->setTitle(tr("GEOM_FACE_FFW"));
   GroupWire->TextLabel1->setText(tr("GEOM_OBJECTS"));
   GroupWire->CheckButton1->setText(tr("GEOM_FACE_OPT"));
-  GroupWire->PushButton1->setPixmap(image1);
+  GroupWire->PushButton1->setIcon(image1);
 
-  Layout1->addWidget(GroupWire, 2, 0);
+  gridLayout1->addWidget(aGroupWireWidget, 2, 0);
   /***************************************************************/
 
   setHelpFileName("face.htm");
@@ -114,7 +119,7 @@ void BuildGUI_FaceDlg::Init()
   connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
 	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
 
-  initName(tr("GEOM_FACE"));
+  initName(tr("GEOM_FACE").toStdString().c_str());
 }
 
 
diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h
index 734cbc2f3..c6a9b207a 100644
--- a/src/BuildGUI/BuildGUI_FaceDlg.h
+++ b/src/BuildGUI/BuildGUI_FaceDlg.h
@@ -43,7 +43,7 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_FaceDlg : public GEOMBase_Skeleton
 
 public:
     BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-		     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+		     const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~BuildGUI_FaceDlg();
 
 protected:
@@ -58,7 +58,7 @@ private:
     
     GEOM::ListOfGO myWires;
     
-    DlgRef_1Sel1Check_QTD* GroupWire;
+    Ui::DlgRef_1Sel1Check_QTD* GroupWire;
 
 private slots:
     void ClickOnOk();
diff --git a/src/BuildGUI/BuildGUI_ShellDlg.cxx b/src/BuildGUI/BuildGUI_ShellDlg.cxx
index 3054237bd..c6b5ded16 100644
--- a/src/BuildGUI/BuildGUI_ShellDlg.cxx
+++ b/src/BuildGUI/BuildGUI_ShellDlg.cxx
@@ -29,14 +29,16 @@
 #include "BuildGUI_ShellDlg.h"
 #include "GEOMImpl_Types.hxx"
 
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
+
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
 #include "TColStd_MapOfInteger.hxx"
 
-#include <qlabel.h>
-
 //=================================================================================
 // class    : BuildGUI_ShellDlg()
 // purpose  : Constructs a BuildGUI_ShellDlg which is a child of 'parent', with the 
@@ -45,28 +47,33 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BuildGUI_ShellDlg::BuildGUI_ShellDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                     const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+                                     const char* name, bool modal, Qt::WindowFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SHELL")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_SHELL_TITLE"));
+  setWindowTitle(tr("GEOM_SHELL_TITLE"));
     
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_SHELL"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupShell = new Ui::DlgRef_1Sel_QTD();
+  QWidget* aGroupShellWidget = new QWidget(this);
+  GroupShell->setupUi(aGroupShellWidget);
+  aGroupShellWidget->setObjectName("GroupShell");
 
-  GroupShell = new DlgRef_1Sel_QTD(this, "GroupShell");
   GroupShell->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupShell->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupShell->PushButton1->setPixmap(image1);
+  GroupShell->PushButton1->setIcon(image1);
   GroupShell->LineEdit1->setReadOnly( true );
   
-  Layout1->addWidget(GroupShell, 2, 0);
+  gridLayout1->addWidget(aGroupShellWidget, 2, 0);
   /***************************************************************/
 
   setHelpFileName("shell.htm");
@@ -112,7 +119,7 @@ void BuildGUI_ShellDlg::Init()
   connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
 	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
 
-  initName(tr("GEOM_SHELL"));
+  initName(tr("GEOM_SHELL").toStdString().c_str());
 }
 
 
diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h
index 8c1132468..a7fd1d1ba 100644
--- a/src/BuildGUI/BuildGUI_ShellDlg.h
+++ b/src/BuildGUI/BuildGUI_ShellDlg.h
@@ -43,7 +43,7 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_ShellDlg : public GEOMBase_Skeleton
 
 public:
     BuildGUI_ShellDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-		      const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+		      const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~BuildGUI_ShellDlg();
 
 protected:
@@ -59,7 +59,7 @@ private:
     GEOM::ListOfGO myFacesAndShells;
     bool myOkFacesAndShells;          /* to check when arguments is defined */
 
-    DlgRef_1Sel_QTD* GroupShell;
+    Ui::DlgRef_1Sel_QTD* GroupShell;
 
 private slots:
     void ClickOnOk();
diff --git a/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx
index 84009bfc2..a254586f4 100644
--- a/src/BuildGUI/BuildGUI_SolidDlg.cxx
+++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx
@@ -29,14 +29,14 @@
 #include "BuildGUI_SolidDlg.h"
 #include "GEOMImpl_Types.hxx"
 
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
+
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
-//Qt includes
-#include <qcheckbox.h>
-#include <qlabel.h>
-
 //=================================================================================
 // class    : BuildGUI_SolidDlg()
 // purpose  : Constructs a BuildGUI_SolidDlg which is a child of 'parent', with the 
@@ -45,29 +45,34 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BuildGUI_SolidDlg::BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                     const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+                                     const char* name, bool modal, Qt::WindowFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SOLID")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_SOLID_TITLE"));
+  setWindowTitle(tr("GEOM_SOLID_TITLE"));
     
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_SOLID"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupSolid = new Ui::DlgRef_1Sel1Check_QTD();
+  QWidget* aGroupSolidWidget = new QWidget(this);
+  GroupSolid->setupUi(aGroupSolidWidget);
+  aGroupSolidWidget->setObjectName("GroupSolid");
 
-  GroupSolid = new DlgRef_1Sel1Check_QTD(this, "GroupSolid");
   GroupSolid->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupSolid->TextLabel1->setText(tr("GEOM_OBJECTS"));
   GroupSolid->CheckButton1->setText(tr("GEOM_CREATE_SINGLE_SOLID"));
-  GroupSolid->PushButton1->setPixmap(image1);
+  GroupSolid->PushButton1->setIcon(image1);
   GroupSolid->LineEdit1->setReadOnly( true );
   
-  Layout1->addWidget(GroupSolid, 2, 0);
+  gridLayout1->addWidget(aGroupSolidWidget, 2, 0);
   /***************************************************************/
 
   setHelpFileName("solid.htm");
@@ -112,7 +117,7 @@ void BuildGUI_SolidDlg::Init()
   connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
 	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
 
-  initName(tr("GEOM_SOLID"));
+  initName(tr("GEOM_SOLID").toStdString().c_str());
 }
 
 
diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h
index 41982f4a2..e9704c394 100644
--- a/src/BuildGUI/BuildGUI_SolidDlg.h
+++ b/src/BuildGUI/BuildGUI_SolidDlg.h
@@ -43,7 +43,7 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_SolidDlg : public GEOMBase_Skeleton
 
 public:
     BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-		      const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+		      const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~BuildGUI_SolidDlg();
 
 protected:
@@ -60,7 +60,7 @@ private:
     bool myOkShells;          /* to check when arguments is defined and
                                  all shells are closed */
 
-    DlgRef_1Sel1Check_QTD* GroupSolid;
+    Ui::DlgRef_1Sel1Check_QTD* GroupSolid;
 
 private slots:
     void ClickOnOk();
diff --git a/src/BuildGUI/BuildGUI_WireDlg.cxx b/src/BuildGUI/BuildGUI_WireDlg.cxx
index 4c9da598a..232ced8d4 100644
--- a/src/BuildGUI/BuildGUI_WireDlg.cxx
+++ b/src/BuildGUI/BuildGUI_WireDlg.cxx
@@ -29,14 +29,16 @@
 #include "BuildGUI_WireDlg.h"
 #include "GEOMImpl_Types.hxx"
 
+#include "GeometryGUI.h"
+#include "GEOMBase.h"
+
+#include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 #include "SalomeApp_Application.h"
 #include "LightApp_SelectionMgr.h"
 
 #include "TColStd_MapOfInteger.hxx"
 
-#include <qlabel.h>
-
 //=================================================================================
 // class    : BuildGUI_WireDlg()
 // purpose  : Constructs a BuildGUI_WireDlg which is a child of 'parent', with the 
@@ -45,28 +47,33 @@
 //            TRUE to construct a modal dialog.
 //=================================================================================
 BuildGUI_WireDlg::BuildGUI_WireDlg(GeometryGUI* theGeometryGUI, QWidget* parent,
-                                   const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+                                   const char* name, bool modal, Qt::WindowFlags fl)
+  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
   QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_WIRE")));
   QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
 
-  setCaption(tr("GEOM_WIRE_TITLE"));
+  setWindowTitle(tr("GEOM_WIRE_TITLE"));
 
   /***************************************************************/
   GroupConstructors->setTitle(tr("GEOM_WIRE"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->close(TRUE);
-  RadioButton3->close(TRUE);
+  RadioButton1->setIcon(image0);
+  RadioButton2->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton2->close();
+  RadioButton3->setAttribute( Qt::WA_DeleteOnClose );
+  RadioButton3->close();
+
+  GroupPoints = new Ui::DlgRef_1Sel_QTD();
+  QWidget* aGroupPointsWidget = new QWidget(this);
+  GroupPoints->setupUi(aGroupPointsWidget);
+  aGroupPointsWidget->setObjectName("GroupPoints");
 
-  GroupPoints = new DlgRef_1Sel_QTD(this, "GroupPoints");
   GroupPoints->GroupBox1->setTitle(tr("GEOM_WIRE_CONNECT"));
   GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
-  GroupPoints->PushButton1->setPixmap(image1);
+  GroupPoints->PushButton1->setIcon(image1);
   GroupPoints->LineEdit1->setReadOnly( true );
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  gridLayout1->addWidget(aGroupPointsWidget, 2, 0);
   /***************************************************************/
 
   setHelpFileName("wire.htm");
@@ -110,7 +117,7 @@ void BuildGUI_WireDlg::Init()
   connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 
 	  SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
   
-  initName(tr("GEOM_WIRE"));
+  initName(tr("GEOM_WIRE").toStdString().c_str());
 }
 
 
diff --git a/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h
index ecfcc2c14..cf828b09a 100644
--- a/src/BuildGUI/BuildGUI_WireDlg.h
+++ b/src/BuildGUI/BuildGUI_WireDlg.h
@@ -43,7 +43,7 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_WireDlg : public GEOMBase_Skeleton
 
 public:
     BuildGUI_WireDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0,
-		     const char* name = 0, bool modal = FALSE, WFlags fl = 0);
+		     const char* name = 0, bool modal = FALSE, Qt::WindowFlags fl = 0);
     ~BuildGUI_WireDlg();
 
 protected:
@@ -59,7 +59,7 @@ private:
     GEOM::ListOfGO myEdgesAndWires;
     bool myOkEdgesAndWires;   /* to check when arguments is defined */
 
-    DlgRef_1Sel_QTD* GroupPoints;
+    Ui::DlgRef_1Sel_QTD* GroupPoints;
 
 private slots:
     void ClickOnOk();
diff --git a/src/src.pro b/src/src.pro
index f9df99fb5..d78196d7d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -30,7 +30,7 @@ SUBDIRS += BasicGUI
 SUBDIRS += PrimitiveGUI
 SUBDIRS += GenerationGUI
 SUBDIRS += EntityGUI
-#SUBDIRS += BuildGUI
+SUBDIRS += BuildGUI
 #SUBDIRS += BooleanGUI
 #SUBDIRS += TransformationGUI
 #SUBDIRS += OperationGUI