Merge relevant changes from V8_0_0_BR branch

SalomeGEOMConfig.cmake.in

@@ -72,29 +72,31 @@ ENDIF()
 # 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_@PROJECT_NAME@ @_PREREQ_LIST@)
-SET(_PREREQ_CONFIG_DIR @_PREREQ_DIR_LIST@)
+SET(_PREREQ_@PROJECT_NAME@_CONFIG_DIR @_PREREQ_DIR_LIST@)
-SET(_PREREQ_COMPONENTS "@_PREREQ_COMPO_LIST@")
+SET(_PREREQ_@PROJECT_NAME@_COMPONENTS "@_PREREQ_COMPO_LIST@")
-LIST(LENGTH _PREREQ_CONFIG_DIR _list_len)
+LIST(LENGTH _PREREQ_@PROJECT_NAME@_CONFIG_DIR _list_len_@PROJECT_NAME@)
-IF(NOT _list_len EQUAL 0)
+IF(NOT _list_len_@PROJECT_NAME@ EQUAL 0)
   # Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ...
-  MATH(EXPR _range "${_list_len}-1")
+  MATH(EXPR _range_@PROJECT_NAME@ "${_list_len_@PROJECT_NAME@}-1")
-  FOREACH(_p RANGE ${_range})  
+  FOREACH(_p_@PROJECT_NAME@ RANGE ${_range_@PROJECT_NAME@})
-    LIST(GET _PREREQ            ${_p} _pkg    )
+    LIST(GET _PREREQ_@PROJECT_NAME@            ${_p_@PROJECT_NAME@} _pkg_@PROJECT_NAME@    )
-    LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
+    LIST(GET _PREREQ_@PROJECT_NAME@_CONFIG_DIR ${_p_@PROJECT_NAME@} _pkg_dir_@PROJECT_NAME@)
-    LIST(GET _PREREQ_COMPONENTS ${_p} _pkg_compo)
+    LIST(GET _PREREQ_@PROJECT_NAME@_COMPONENTS ${_p_@PROJECT_NAME@} _pkg_compo_@PROJECT_NAME@)
-    MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
+    IF(NOT OMIT_DETECT_PACKAGE_${_pkg_@PROJECT_NAME@})
-    IF(NOT _pkg_compo)
+      MESSAGE(STATUS "===> Reloading targets from ${_pkg_@PROJECT_NAME@} ...")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
+      IF(NOT _pkg_compo_@PROJECT_NAME@)
-          PATHS "${_pkg_dir}" 
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
-          NO_DEFAULT_PATH)
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
-    ELSE()
+            NO_DEFAULT_PATH)
-      STRING(REPLACE "," ";" _compo_lst "${_pkg_compo}")
+      ELSE()
-      MESSAGE(STATUS "===> (components: ${_pkg_compo})")
+        STRING(REPLACE "," ";" _compo_lst_@PROJECT_NAME@ "${_pkg_compo_@PROJECT_NAME@}")
-      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE
+        MESSAGE(STATUS "===> (components: ${_pkg_compo_@PROJECT_NAME@})")
-          COMPONENTS ${_compo_lst} 
+        FIND_PACKAGE(${_pkg_@PROJECT_NAME@} REQUIRED NO_MODULE
-          PATHS "${_pkg_dir}"
+            COMPONENTS ${_compo_lst_@PROJECT_NAME@}
-          NO_DEFAULT_PATH)
+            PATHS "${_pkg_dir_@PROJECT_NAME@}"
+            NO_DEFAULT_PATH)
+      ENDIF()
     ENDIF()
   ENDFOREACH()
 ENDIF()

src/AdvancedGUI/CMakeLists.txt

@@ -18,7 +18,6 @@
 #
 
 INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

src/BREPPlugin/CMakeLists.txt

@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

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->TextLabel2->setVisible(isParam);
-    GroupOnSurface->TextLabel3->setShown(isParam);
+    GroupOnSurface->TextLabel3->setVisible(isParam);
-    GroupOnSurface->SpinBox_DX->setShown(isParam);
+    GroupOnSurface->SpinBox_DX->setVisible(isParam);
-    GroupOnSurface->SpinBox_DY->setShown(isParam);
+    GroupOnSurface->SpinBox_DY->setVisible(isParam);
   }
 
-  GroupXYZ->setShown(!isParam && !isLength);
+  GroupXYZ->setVisible(!isParam && !isLength);
 
   if (theIsUpdate)
     QTimer::singleShot(50, this, SLOT(updateSize()));

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 ---
 

src/BlocksGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

src/BooleanGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

src/BuildGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

src/CurveCreator/CMakeLists.txt

@@ -18,7 +18,7 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQt4Ext)
 ENDIF(SALOME_BUILD_GUI)
 
 # --- options ---

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

src/EntityGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

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) {

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

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 ---
 

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

src/GEOMGUI/CMakeLists.txt

@@ -18,7 +18,6 @@
 #
 
 INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

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;
 }
 
 //=================================================================================

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 ---
 

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->setAutoDefault(true);
-  buttonOk->setDefault(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);
   /***************************************************************/
 

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->setAutoDefault(true);
-  buttonOk->setDefault(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);
   /***************************************************************/
 

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->setAutoDefault( true );
-  buttonOk->setDefault( 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 );
   /***************************************************************/
   

src/GEOM_SWIG_WITHIHM/CMakeLists.txt

@@ -18,7 +18,6 @@
 #
 
 INCLUDE(${SWIG_USE_FILE})
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

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 ---
 

src/GroupGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

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 );
           }

src/IGESPlugin/CMakeLists.txt

@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

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 );

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 ---
 

src/MeasureGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

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 ---

src/OperationGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

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 ---
 

src/RepairGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

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( 0 )->setVisible( constructorId == BY_PARAM );
-  myIsParameterGr->button( 1 )->setShown( constructorId == BY_PARAM );
+  myIsParameterGr->button( 1 )->setVisible( constructorId == BY_PARAM );
-  myValEdt                    ->setShown( constructorId == BY_PARAM );
+  myValEdt                    ->setVisible( constructorId == BY_PARAM );
-  myValLbl                    ->setShown( constructorId == BY_PARAM );
+  myValLbl                    ->setVisible( constructorId == BY_PARAM );
-  GroupPoints->TextLabel2     ->setShown( constructorId == BY_POINT_PROJ );
+  GroupPoints->TextLabel2     ->setVisible( constructorId == BY_POINT_PROJ );
-  GroupPoints->PushButton2    ->setShown( constructorId == BY_POINT_PROJ );
+  GroupPoints->PushButton2    ->setVisible( constructorId == BY_POINT_PROJ );
-  GroupPoints->LineEdit2      ->setShown( constructorId == BY_POINT_PROJ );
+  GroupPoints->LineEdit2      ->setVisible( constructorId == BY_POINT_PROJ );
 
   initSelection();
 

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->TextLabel3->setVisible(false);
-  GroupVertexes->SpinBox_DX->setShown(false);
+  GroupVertexes->SpinBox_DX->setVisible(false);
 
   QVBoxLayout* layout = new QVBoxLayout (centralWidget());
   layout->setMargin(0);

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 );
 }
 

src/STEPPlugin/CMakeLists.txt

@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

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()) {

src/STLPlugin/CMakeLists.txt

@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

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 );

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

src/TransformationGUI/CMakeLists.txt

@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#INCLUDE(UseQt4Ext)
+INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
 
 # --- options ---
 

src/VTKPlugin/CMakeLists.txt

@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---

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 );

src/XAOPlugin/CMakeLists.txt

@@ -19,7 +19,6 @@
 
 IF(SALOME_BUILD_GUI)
   INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
 ENDIF()
 
 # --- options ---