Merge relevant changes from V8_0_0_BR branch

diff --git a/SalomeGEOMConfig.cmake.in b/SalomeGEOMConfig.cmake.in
index fe0e4b8f55687129720f7d41e6003aa4647c4d9a..42db6d36b81272b12252c6ee3f95aff42ddd8624 100644 (file)
--- a/SalomeGEOMConfig.cmake.in
+++ b/SalomeGEOMConfig.cmake.in
@@ -69,32 +69,34 @@ IF(SALOME_GEOM_USE_OPENCV)
   LIST(APPEND GEOM_DEFINITIONS "-DWITH_OPENCV")
 ENDIF()
 
-# For all prerequisites, load the corresponding targets if the package was used 
+# For all prerequisites, load the corresponding targets if the package was used
 # in CONFIG mode. This ensures dependent projects link correctly
 # without having to set LD_LIBRARY_PATH:
-SET(_PREREQ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
-IF(NOT _list_len EQUAL 0)
+SET(_PREREQ_@PROJECT_NAME@ @_PREREQ_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
-  FOREACH(_p RANGE ${_range})  
-    LIST(GET _PREREQ            ${_p} _pkg    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
-    IF(NOT _pkg_compo)
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
-          PATHS "${_pkg_dir}" 
-          NO_DEFAULT_PATH)
-    ELSE()
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
-          COMPONENTS ${_compo_lst} 
-          PATHS "${_pkg_dir}"
-          NO_DEFAULT_PATH)
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ELSE()
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()

diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt
index b2df1cc476a946d7a1094a297e7744a5a996354f..c97ceb6d69fd44434f0ca8d4f80f2d93f65303e3 100755 (executable)
--- a/src/AdvancedGUI/CMakeLists.txt
+++ b/src/AdvancedGUI/CMakeLists.txt
@@ -18,7 +18,6 @@
 #
 
 INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

diff --git a/src/BREPPlugin/CMakeLists.txt b/src/BREPPlugin/CMakeLists.txt
index 0372c1e6402b5a998f5515f5aa5f5c8ea0fcb740..df959433d8b8f8f6f7741c2ab876c4e9cc3d9b3c 100644 (file)
--- a/src/BREPPlugin/CMakeLists.txt
+++ b/src/BREPPlugin/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx
index 96a989a88d832be38154cfe41fa39e5ae8642db8..021592e5130d48bf467dff70a07139acf8d0fc09 100644 (file)
--- a/src/BasicGUI/BasicGUI_PointDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PointDlg.cxx
@@ -995,13 +995,13 @@ void BasicGUI_PointDlg::updateParamCoord(bool theIsUpdate)
     }
   }
   else if (id == GEOM_POINT_SURF) {
-    GroupOnSurface->TextLabel2->setShown(isParam);
-    GroupOnSurface->TextLabel3->setShown(isParam);
-    GroupOnSurface->SpinBox_DX->setShown(isParam);
-    GroupOnSurface->SpinBox_DY->setShown(isParam);
+    GroupOnSurface->TextLabel2->setVisible(isParam);
+    GroupOnSurface->TextLabel3->setVisible(isParam);
+    GroupOnSurface->SpinBox_DX->setVisible(isParam);
+    GroupOnSurface->SpinBox_DY->setVisible(isParam);
   }
 
-  GroupXYZ->setShown(!isParam && !isLength);
+  GroupXYZ->setVisible(!isParam && !isLength);
 
   if (theIsUpdate)
     QTimer::singleShot(50, this, SLOT(updateSize()));

diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt
index 3a4821820ca4414fcc4e20b596869f47408c8e90..f8d207551fb9040da4ac001db59dfe9553718dce 100755 (executable)
--- a/src/BasicGUI/CMakeLists.txt
+++ b/src/BasicGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/BlocksGUI/CMakeLists.txt b/src/BlocksGUI/CMakeLists.txt
index ebc68572c05c7eab8ecceba39030c5504c98584b..8103522059c0c00b1254cb7c9ee65261e64ac204 100755 (executable)
--- a/src/BlocksGUI/CMakeLists.txt
+++ b/src/BlocksGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/BooleanGUI/CMakeLists.txt b/src/BooleanGUI/CMakeLists.txt
index e7c9b7850cf6d7744ac87e50485de6871c1662aa..31449e449d2e4e07a6d63bf42c7d77376ebeb268 100755 (executable)
--- a/src/BooleanGUI/CMakeLists.txt
+++ b/src/BooleanGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/BuildGUI/CMakeLists.txt b/src/BuildGUI/CMakeLists.txt
index 37bcff647a4f08fbe34608cc1543a81d70f72736..301e45725be8e11c758b79caef321a3294871bac 100755 (executable)
--- a/src/BuildGUI/CMakeLists.txt
+++ b/src/BuildGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/CurveCreator/CMakeLists.txt b/src/CurveCreator/CMakeLists.txt
index c085fc69f014213067c4a1ded8b8bf7becee394d..dff45867683bb5ba5cae86dc549796ef8cf53405 100644 (file)
--- a/src/CurveCreator/CMakeLists.txt
+++ b/src/CurveCreator/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQt4Ext)
 ENDIF(SALOME_BUILD_GUI)
 
 # --- options ---

diff --git a/src/DisplayGUI/CMakeLists.txt b/src/DisplayGUI/CMakeLists.txt
index 7a9d92208017d765c1f2d3ccccfb0717100b5779..bfca525b2b8752d8688cc89b7c8cd7606d577f82 100755 (executable)
--- a/src/DisplayGUI/CMakeLists.txt
+++ b/src/DisplayGUI/CMakeLists.txt
@@ -17,9 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories

diff --git a/src/EntityGUI/CMakeLists.txt b/src/EntityGUI/CMakeLists.txt
index 0bb93f921c92435cfd152cf93f47709b534d103f..10b849be229cc7cd5af0b4fc780cbac7517d1f9a 100755 (executable)
--- a/src/EntityGUI/CMakeLists.txt
+++ b/src/EntityGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx
index 6e887f941eca2fbbf3a3d11d8de88ea8fb4ca584..aab2def9b6568c4112ec9d740d3317d6320e3027 100644 (file)
--- a/src/EntityGUI/EntityGUI_FieldDlg.cxx
+++ b/src/EntityGUI/EntityGUI_FieldDlg.cxx
@@ -1695,7 +1695,7 @@ void EntityGUI_FieldDlg::activateSelection()
         TopoDS_Shape aSubShape = myShapeMap( index );
         QString anEntry = QString( "TEMP_" ) + aMainEntry.in() + QString("_%1").arg(index);
         Handle(SALOME_InteractiveObject) io =
-          new SALOME_InteractiveObject(anEntry.toAscii(), "GEOM", "TEMP_IO");
+          new SALOME_InteractiveObject(anEntry.toLatin1(), "GEOM", "TEMP_IO");
         aDisplayer->SetColor( aCol );
         SALOME_Prs* aPrs = aDisplayer->buildSubshapePresentation(aSubShape, anEntry, aView);
         if (aPrs) {

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 6b0248b08c2c9986ec43ec78cd3f5f11890ecb83..6749738fdec2ec85ebfbfd9ab742db57ca5a3be2 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -1143,7 +1143,7 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
     }
 
     QString Command = myCommand.join( "" );
-    Sketcher_Profile aProfile = Sketcher_Profile( Command.toAscii() );
+    Sketcher_Profile aProfile = Sketcher_Profile( Command.toLatin1() );
     bool isDone = false;
     TopoDS_Shape myShape = aProfile.GetShape( &isDone );
     if ( isDone ) {
@@ -2341,12 +2341,12 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
 
     //Last Shape
     QString Command1 = myCommand.join( "" );
-    Sketcher_Profile aProfile1( Command1.toAscii() );
+    Sketcher_Profile aProfile1( Command1.toLatin1() );
     myShape1 = aProfile1.GetShape();
 
     //Current Shape
     QString Command2 = Command1 + GetNewCommand( aParameters );
-    Sketcher_Profile aProfile2( Command2.toAscii() );
+    Sketcher_Profile aProfile2( Command2.toLatin1() );
     myShape2 = aProfile2.GetShape( &isDone, &error );
 
     //Error Message

diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt
index f3cc03f2680687e6f43bce97e4d87b7998674515..1aa48c6eec8fe3dab22581bf7bfe98b4bd8fd3cd 100755 (executable)
--- a/src/GEOMBase/CMakeLists.txt
+++ b/src/GEOMBase/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/GEOMFiltersSelection/CMakeLists.txt b/src/GEOMFiltersSelection/CMakeLists.txt
index d999542d4eba5eed00358da24ec3ebdd106b2e52..237fe4e35a09263e18588ec93643fb62cf9b79be 100755 (executable)
--- a/src/GEOMFiltersSelection/CMakeLists.txt
+++ b/src/GEOMFiltersSelection/CMakeLists.txt
@@ -17,8 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
-
 # --- options ---
 
 # additional include directories

diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt
index c5e9e928f19b0d34ec243cdea90f3e10542158c0..065d2caf84c383f546f7972d0ebd53fd11f45ea5 100755 (executable)
--- a/src/GEOMGUI/CMakeLists.txt
+++ b/src/GEOMGUI/CMakeLists.txt
@@ -18,7 +18,6 @@
 #
 
 INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx
index f743932508e5a96c1d9735520764b7d7e4041771..9425cb809fc7f50c58e7da891998425bbccdefce 100644 (file)
--- a/src/GEOMGUI/GEOMGUI.cxx
+++ b/src/GEOMGUI/GEOMGUI.cxx
@@ -54,7 +54,7 @@ GEOMGUI::~GEOMGUI()
 //=================================================================================
 bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/, const QVariant& /*theParam*/  )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
@@ -63,17 +63,17 @@ bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/, const
 //=================================================================================
 bool GEOMGUI::OnGUIEvent( int /*theCommandID*/, SUIT_Desktop* /*parent*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
 // class    : GEOMGUI::OnMousePress
-// purpose  : Mouse press event processing. Should return FALSE to let the event 
+// purpose  : Mouse press event processing. Should return false to let the event 
 //            be processed further.
 //=================================================================================
 bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return FALSE;
+  return false;
 }
 
 //=================================================================================
@@ -82,7 +82,7 @@ bool GEOMGUI::OnMousePress( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_
 //=================================================================================
 bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
@@ -91,7 +91,7 @@ bool GEOMGUI::OnMouseMove( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_V
 //=================================================================================
 bool GEOMGUI::OnMouseRelease( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================
@@ -100,7 +100,7 @@ bool GEOMGUI::OnMouseRelease( QMouseEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUI
 //=================================================================================
 bool GEOMGUI::OnKeyPress( QKeyEvent* /*pe*/, SUIT_Desktop* /*parent*/, SUIT_ViewWindow* /*studyFrame*/ )
 {
-  return TRUE;
+  return true;
 }
 
 //=================================================================================

diff --git a/src/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt
index cb3e004cb7117deb010018b833fb92fb5150c4c2..e6438e07d1ee3824f01bdf9ee4a1986fc281fe42 100755 (executable)
--- a/src/GEOMToolsGUI/CMakeLists.txt
+++ b/src/GEOMToolsGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
index f977e08d92da60bef029ab573c05fabab0da8213..0a8e4ffdee156502cfeddbab559133679353ea1f 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
@@ -43,7 +43,7 @@
 // purpose  : Constructs a GEOMToolsGUI_DeflectionDlg which is a child of 'parent', with the
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
-//            TRUE to construct a modal dialog.
+//            true to construct a modal dialog.
 //=================================================================================
 GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
@@ -52,7 +52,7 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   setModal(true);
 
   setWindowTitle(tr("GEOM_DEFLECTION_TLT"));
-  setSizeGripEnabled(TRUE);
+  setSizeGripEnabled(true);
   QGridLayout* MyDialogLayout = new QGridLayout(this);
   MyDialogLayout->setSpacing(6);
   MyDialogLayout->setMargin(11);
@@ -101,8 +101,8 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   QPushButton* buttonOk = new QPushButton (GroupButtons);
   buttonOk->setObjectName("buttonOk");
   buttonOk->setText(tr("GEOM_BUT_OK"));
-  buttonOk->setAutoDefault(TRUE);
-  buttonOk->setDefault(TRUE);
+  buttonOk->setAutoDefault(true);
+  buttonOk->setDefault(true);
   GroupButtonsLayout->addWidget(buttonOk, 0, 0);
 
   GroupButtonsLayout->addItem(new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
@@ -110,13 +110,13 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent)
   QPushButton* buttonCancel = new QPushButton (GroupButtons);
   buttonCancel->setObjectName("buttonCancel");
   buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
-  buttonCancel->setAutoDefault(TRUE);
+  buttonCancel->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
 
   QPushButton* buttonHelp = new QPushButton (GroupButtons);
   buttonHelp->setObjectName("buttonHelp");
   buttonHelp->setText(tr("GEOM_BUT_HELP"));
-  buttonHelp->setAutoDefault(TRUE);
+  buttonHelp->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonHelp, 0, 2);
   /***************************************************************/
 

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
index 95713739cdd944e1c35502b35323aa480ebc9d32..82985ae1a99a04ec4f428d264ce816ec3162690b 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.cxx
@@ -44,7 +44,7 @@
 // purpose  : Constructs a GEOMToolsGUI_LineWidthDlg which is a child of 'parent', with the
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
-//            TRUE to construct a modal dialog.
+//            true to construct a modal dialog.
 //=================================================================================
 
 GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QString& title)
@@ -54,7 +54,7 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
   setModal(true);
 
   setWindowTitle(tr(title.toLatin1().constData()));
-  setSizeGripEnabled(TRUE);
+  setSizeGripEnabled(true);
   QGridLayout* MyDialogLayout = new QGridLayout(this);
   MyDialogLayout->setSpacing(6);
   MyDialogLayout->setMargin(11);
@@ -95,8 +95,8 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
   QPushButton* buttonOk = new QPushButton (GroupButtons);
   buttonOk->setObjectName("buttonOk");
   buttonOk->setText(tr("GEOM_BUT_OK"));
-  buttonOk->setAutoDefault(TRUE);
-  buttonOk->setDefault(TRUE);
+  buttonOk->setAutoDefault(true);
+  buttonOk->setDefault(true);
   GroupButtonsLayout->addWidget(buttonOk, 0, 0);
 
   GroupButtonsLayout->addItem(new QSpacerItem (20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1);
@@ -104,13 +104,13 @@ GEOMToolsGUI_LineWidthDlg::GEOMToolsGUI_LineWidthDlg (QWidget* parent, const QSt
   QPushButton* buttonCancel = new QPushButton (GroupButtons);
   buttonCancel->setObjectName("buttonCancel");
   buttonCancel->setText(tr("GEOM_BUT_CANCEL"));
-  buttonCancel->setAutoDefault(TRUE);
+  buttonCancel->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonCancel, 0, 1);
 
   QPushButton* buttonHelp = new QPushButton (GroupButtons);
   buttonHelp->setObjectName("buttonHelp");
   buttonHelp->setText(tr("GEOM_BUT_HELP"));
-  buttonHelp->setAutoDefault(TRUE);
+  buttonHelp->setAutoDefault(true);
   GroupButtonsLayout->addWidget(buttonHelp, 0, 2);
   /***************************************************************/
 

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
index ab1ea6692e4399a7afcc2405b0d9468f077e15fe..4e7541f0422a700ffbc9e3be430a6a36688993df 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
@@ -44,7 +44,7 @@
 // purpose  : Constructs a GEOMToolsGUI_NbIsosDlg which is a child of 'parent', with the 
 //            name 'name' and widget flags set to 'f'.
 //            The dialog will by default be modeless, unless you set 'modal' to
-//            TRUE to construct a modal dialog.
+//            true to construct a modal dialog.
 //=================================================================================
 GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   :QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint )
@@ -53,7 +53,7 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   setModal( true );
 
   setWindowTitle( tr( "GEOM_MEN_ISOS" ) );
-  setSizeGripEnabled(TRUE);
+  setSizeGripEnabled(true);
   QGridLayout* MyDialogLayout = new QGridLayout(this); 
   MyDialogLayout->setSpacing(6);
   MyDialogLayout->setMargin(11);
@@ -101,8 +101,8 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   QPushButton* buttonOk = new QPushButton( GroupButtons );
   buttonOk->setObjectName( "buttonOk" );
   buttonOk->setText( tr( "GEOM_BUT_OK" ) ) ;
-  buttonOk->setAutoDefault( TRUE );
-  buttonOk->setDefault( TRUE );
+  buttonOk->setAutoDefault( true );
+  buttonOk->setDefault( true );
   GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
   
   GroupButtonsLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
@@ -110,13 +110,13 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent )
   QPushButton* buttonCancel = new QPushButton( GroupButtons );
   buttonCancel->setObjectName( "buttonCancel" );
   buttonCancel->setText( tr( "GEOM_BUT_CANCEL" ) ) ;
-  buttonCancel->setAutoDefault( TRUE );
+  buttonCancel->setAutoDefault( true );
   GroupButtonsLayout->addWidget( buttonCancel, 0, 1 );
 
   QPushButton* buttonHelp = new QPushButton( GroupButtons );
   buttonHelp->setObjectName( "buttonHelp" );
   buttonHelp->setText( tr( "GEOM_BUT_HELP" ) ) ;
-  buttonHelp->setAutoDefault( TRUE );
+  buttonHelp->setAutoDefault( true );
   GroupButtonsLayout->addWidget( buttonHelp, 0, 2 );
   /***************************************************************/
   

diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
index 99e8d185699de1d616214165dd3ac84546aa9d51..4b06077951312ac34fd35c0bec75a6f8bf704b9f 100755 (executable)
--- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
+++ b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
@@ -18,7 +18,6 @@
 #
 
 INCLUDE(${SWIG_USE_FILE})
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt
index b60f1dde6b0d767bff471d15b103adf154ae4376..21341b341cb48c89be5fa38023e91c35d8f24456 100755 (executable)
--- a/src/GenerationGUI/CMakeLists.txt
+++ b/src/GenerationGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/GroupGUI/CMakeLists.txt b/src/GroupGUI/CMakeLists.txt
index 73e18271bbad8586b320fa1d3d9df1ec762b64f8..69d998b915cc4135e1e4c9c78ad427f61281f4fd 100755 (executable)
--- a/src/GroupGUI/CMakeLists.txt
+++ b/src/GroupGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index aec21881f3cfd50afd055b31effe0229429e5d53..c856096150462d128e40d21b502073a69a356c01 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -1098,7 +1098,7 @@ void GroupGUI_GroupDlg::activateSelection()
           int index = aSubShapesMap.FindIndex(aSubShape);
           QString anEntry = QString( "TEMP_" ) + anEntryBase + QString("_%1").arg(index);
           Handle(SALOME_InteractiveObject) io =
-            new SALOME_InteractiveObject(anEntry.toAscii(), "GEOM", "TEMP_IO");
+            new SALOME_InteractiveObject(anEntry.toLatin1(), "GEOM", "TEMP_IO");
           if ( myGroupIdList.contains( index ) ) {
             aDisplayer->SetColor( aCol );
           }

diff --git a/src/IGESPlugin/CMakeLists.txt b/src/IGESPlugin/CMakeLists.txt
index b380989f415c12ccb4a01b02398bf6c46f6fef78..f286bbb166fb8be664ffcf030316bb76bbd4f2b3 100644 (file)
--- a/src/IGESPlugin/CMakeLists.txt
+++ b/src/IGESPlugin/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

diff --git a/src/IGESPlugin/IGESPlugin_ExportDlg.cxx b/src/IGESPlugin/IGESPlugin_ExportDlg.cxx
index cb667070f99dfe86f83d92a7b5a8ae55e24d42ea..a49db7ffc2e1cd0fc461be328bf45d37e6f1236b 100644 (file)
--- a/src/IGESPlugin/IGESPlugin_ExportDlg.cxx
+++ b/src/IGESPlugin/IGESPlugin_ExportDlg.cxx
@@ -69,7 +69,7 @@ QString IGESPlugin_ExportDlg::getFileName( const QString& initial, const QString
 
   IGESPlugin_ExportDlg fd( parent );
   fd.setFileMode( AnyFile );
-  fd.setFilters( fls );
+  fd.setNameFilters( fls );
   fd.setWindowTitle( caption );
   if ( !tmpfilename.isEmpty() )
     fd.processPath( tmpfilename );

diff --git a/src/Material/CMakeLists.txt b/src/Material/CMakeLists.txt
index f8957e5623f27760bb64ac97c6353f560d40afcd..94ab5acc2b6b1c623db95f3c91aeca1523b57f98 100755 (executable)
--- a/src/Material/CMakeLists.txt
+++ b/src/Material/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/MeasureGUI/CMakeLists.txt b/src/MeasureGUI/CMakeLists.txt
index eaae08f27afdae774af31ddf9153abbe10c31ee8..ee8ffdf0d6ce2781705ab4fb36a1dfd2895a98da 100755 (executable)
--- a/src/MeasureGUI/CMakeLists.txt
+++ b/src/MeasureGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index 60a7497caaa2ef518d931010770104d63812fc79..7330c95536806fcffafdb2ba1a9137429584364c 100755 (executable)
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -17,7 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
 INCLUDE(${VTK_USE_FILE})
 
 # --- options ---

diff --git a/src/OperationGUI/CMakeLists.txt b/src/OperationGUI/CMakeLists.txt
index 4fa28ace00c1a105ae30669dbfc143dcf7eb7f99..2ff65aed2194b684f3392abbd47e9a2425513238 100755 (executable)
--- a/src/OperationGUI/CMakeLists.txt
+++ b/src/OperationGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/PrimitiveGUI/CMakeLists.txt b/src/PrimitiveGUI/CMakeLists.txt
index e90b50c65780000b8ec98dfe7c05d33a412ffcba..e24ab15d446e1757bbb370bf487786f489e16ab0 100755 (executable)
--- a/src/PrimitiveGUI/CMakeLists.txt
+++ b/src/PrimitiveGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/RepairGUI/CMakeLists.txt b/src/RepairGUI/CMakeLists.txt
index d9ae6fa297036529162433dab71a0711127fe2bc..c859bc5e9f8168b16de6558ef82030f2fe717d94 100755 (executable)
--- a/src/RepairGUI/CMakeLists.txt
+++ b/src/RepairGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 673f29d6b7561546db266aecb65b6a05004f3f3c..21f39aef923e9d0fb9a59e2199d6f35954ce7ab1 100644 (file)
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -127,13 +127,13 @@ RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg( GeometryGUI* theGeometryGUI, Q
 //=======================================================================
 void RepairGUI_DivideEdgeDlg::ConstructorsClicked( int constructorId )
 {
-  myIsParameterGr->button( 0 )->setShown( constructorId == BY_PARAM );
-  myIsParameterGr->button( 1 )->setShown( constructorId == BY_PARAM );
-  myValEdt                    ->setShown( constructorId == BY_PARAM );
-  myValLbl                    ->setShown( constructorId == BY_PARAM );
-  GroupPoints->TextLabel2     ->setShown( constructorId == BY_POINT_PROJ );
-  GroupPoints->PushButton2    ->setShown( constructorId == BY_POINT_PROJ );
-  GroupPoints->LineEdit2      ->setShown( constructorId == BY_POINT_PROJ );
+  myIsParameterGr->button( 0 )->setVisible( constructorId == BY_PARAM );
+  myIsParameterGr->button( 1 )->setVisible( constructorId == BY_PARAM );
+  myValEdt                    ->setVisible( constructorId == BY_PARAM );
+  myValLbl                    ->setVisible( constructorId == BY_PARAM );
+  GroupPoints->TextLabel2     ->setVisible( constructorId == BY_POINT_PROJ );
+  GroupPoints->PushButton2    ->setVisible( constructorId == BY_POINT_PROJ );
+  GroupPoints->LineEdit2      ->setVisible( constructorId == BY_POINT_PROJ );
 
   initSelection();
 

diff --git a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
index ac1372811e1403a9d09a99955de34f124521d5d6..d6671dbbf4e7135598513d8d0b2284e3e797b2fe 100644 (file)
--- a/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FuseEdgesDlg.cxx
@@ -69,8 +69,8 @@ RepairGUI_FuseEdgesDlg::RepairGUI_FuseEdgesDlg (GeometryGUI* theGeometryGUI,
   GroupVertexes->LineEdit1->setReadOnly(true);
   GroupVertexes->LineEdit2->setReadOnly(true);
 
-  GroupVertexes->TextLabel3->setShown(false);
-  GroupVertexes->SpinBox_DX->setShown(false);
+  GroupVertexes->TextLabel3->setVisible(false);
+  GroupVertexes->SpinBox_DX->setVisible(false);
 
   QVBoxLayout* layout = new QVBoxLayout (centralWidget());
   layout->setMargin(0);

diff --git a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
index a66f9c18edb8ff46ca807b4aa2f72d589f16bc49..8d3a9f3a620276420120f5709e9e1f8b51ba7ccc 100644 (file)
--- a/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
+++ b/src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
@@ -145,7 +145,7 @@ RepairGUI_InspectObjectDlg::TreeWidgetItem::TreeWidgetItem
   myShape( shape ),
   myTolerance (theTolerance)
 {
-  myIO = new SALOME_InteractiveObject( entry.toAscii(), "GEOM", "TEMP_IO" );
+  myIO = new SALOME_InteractiveObject( entry.toLatin1(), "GEOM", "TEMP_IO" );
   setFlags( flags() | Qt::ItemIsEditable );
 }
 

diff --git a/src/STEPPlugin/CMakeLists.txt b/src/STEPPlugin/CMakeLists.txt
index 52d210920ba3c99563119c727f7385448699c791..db71d3b2454b5828df5a42b44ad73970340acc3e 100644 (file)
--- a/src/STEPPlugin/CMakeLists.txt
+++ b/src/STEPPlugin/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

diff --git a/src/STEPPlugin/STEPPlugin_ExportDlg.cxx b/src/STEPPlugin/STEPPlugin_ExportDlg.cxx
index 2f8124b29a7f982b7ee90ab0768112c0ac92dc5c..476934dbf885c953c277f63aa8e87667a6fe71f7 100644 (file)
--- a/src/STEPPlugin/STEPPlugin_ExportDlg.cxx
+++ b/src/STEPPlugin/STEPPlugin_ExportDlg.cxx
@@ -89,7 +89,7 @@ QString STEPPlugin_ExportDlg::getFileName(const QString           &theInitial,
   STEPPlugin_ExportDlg aDlg(theParent);
 
   aDlg.setFileMode(AnyFile);
-  aDlg.setFilters(aFls);
+  aDlg.setNameFilters(aFls);
   aDlg.setWindowTitle(theCaption);
 
   if (!aTmpFileName.isEmpty()) {

diff --git a/src/STLPlugin/CMakeLists.txt b/src/STLPlugin/CMakeLists.txt
index 954610a780e0a1589a9c9c0a67d533d9d37b5700..a3ccb8b7f786431ef567d693435eb15dbdd18de0 100644 (file)
--- a/src/STLPlugin/CMakeLists.txt
+++ b/src/STLPlugin/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

diff --git a/src/STLPlugin/STLPlugin_ExportDlg.cxx b/src/STLPlugin/STLPlugin_ExportDlg.cxx
index 05616e15d330a1d7fd8644f4ff640669cf0c41fe..0d36f35e7f96c034f37b42bc26fb97f26ddffad5 100644 (file)
--- a/src/STLPlugin/STLPlugin_ExportDlg.cxx
+++ b/src/STLPlugin/STLPlugin_ExportDlg.cxx
@@ -175,7 +175,7 @@ QString STLPlugin_ExportDlg::getFileName( const Handle(SALOME_InteractiveObject)
 
   STLPlugin_ExportDlg fd( io, parent );
   fd.setFileMode( AnyFile );
-  fd.setFilters( fls );
+  fd.setNameFilters( fls );
   fd.setWindowTitle( caption );
   if ( !tmpfilename.isEmpty() )
     fd.processPath( tmpfilename );

diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt
index 61f4072c682435c3bd92263ddbe4e2c624f2a2f4..a46f02c814535f132180c9394d6f47bd14cc7190 100755 (executable)
--- a/src/ShapeRecognition/CMakeLists.txt
+++ b/src/ShapeRecognition/CMakeLists.txt
@@ -17,8 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE( ${QT_USE_FILE} )
-
 # --- options ---
 
 # additional include directories

diff --git a/src/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt
index 2b4b75858891ce0f7f6ce2796e9b77d64e9642e6..5884b506c034c895c73615ba751acabbe97a3474 100755 (executable)
--- a/src/TransformationGUI/CMakeLists.txt
+++ b/src/TransformationGUI/CMakeLists.txt
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQt4Ext)
 
 # --- options ---
 

diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt
index 9f67135eb18e3d0c418b8bac026ee0b3db368869..86d927d4194a6a75ff28ad4d35cbf828a17d8ddb 100644 (file)
--- a/src/VTKPlugin/CMakeLists.txt
+++ b/src/VTKPlugin/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

diff --git a/src/VTKPlugin/VTKPlugin_ExportDlg.cxx b/src/VTKPlugin/VTKPlugin_ExportDlg.cxx
index b4af670b54377dce401445a22d1ec0ac019378fe..40e69f4f1d225ad788fc2222fe84dc49ace880bb 100644 (file)
--- a/src/VTKPlugin/VTKPlugin_ExportDlg.cxx
+++ b/src/VTKPlugin/VTKPlugin_ExportDlg.cxx
@@ -99,7 +99,7 @@ QString VTKPlugin_ExportDlg::getFileName( const Handle(SALOME_InteractiveObject)
 
   VTKPlugin_ExportDlg fd( io, parent );
   fd.setFileMode( AnyFile );
-  fd.setFilters( fls );
+  fd.setNameFilters( fls );
   fd.setWindowTitle( caption );
   if ( !tmpfilename.isEmpty() )
     fd.processPath( tmpfilename );

diff --git a/src/XAOPlugin/CMakeLists.txt b/src/XAOPlugin/CMakeLists.txt
index 47d6a2ff307ebe59801cb1138f8521ce6a175c74..6634a1ac8c52a9b919b612f97e4274a10233e0d9 100644 (file)
--- a/src/XAOPlugin/CMakeLists.txt
+++ b/src/XAOPlugin/CMakeLists.txt
@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---