From: rnv Date: Thu, 30 May 2019 12:11:32 +0000 (+0300) Subject: Remove QT4 compatibility. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2ff00c531c180643abfb56a55fbbcaa1d93cfeb7;p=modules%2Fsmesh.git Remove QT4 compatibility. --- diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx index 38f59d9a8..246adbfbb 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx @@ -575,11 +575,7 @@ QFrame* SMESHGUI_ComputeDlg::createMainFrame (QWidget* theParent, bool ForEval) myTable->hideColumn( COL_PUBLISHED ); myTable->hideColumn( COL_SHAPEID ); myTable->hideColumn( COL_BAD_MESH ); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myTable->horizontalHeader()->setResizeMode( COL_ERROR, QHeaderView::Interactive ); -#else myTable->horizontalHeader()->setSectionResizeMode( COL_ERROR, QHeaderView::Interactive ); -#endif myTable->setWordWrap( true ); myTable->horizontalHeader()->setStretchLastSection( true ); myTable->setMinimumWidth( 500 ); diff --git a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx index fc5ac8b73..142f41ad5 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfo.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfo.cxx @@ -2147,11 +2147,7 @@ SMESHGUI_TreeElemInfo::SMESHGUI_TreeElemInfo( QWidget* parent ) myInfo->setColumnCount( 2 ); myInfo->setHeaderLabels( QStringList() << tr( "PROPERTY" ) << tr( "VALUE" ) ); myInfo->header()->setStretchLastSection( true ); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myInfo->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); -#else myInfo->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); -#endif myInfo->setItemDelegate( new ItemDelegate( myInfo ) ); QVBoxLayout* l = new QVBoxLayout( centralWidget() ); l->setMargin( 0 ); @@ -2379,11 +2375,7 @@ SMESHGUI_AddInfo::SMESHGUI_AddInfo( QWidget* parent ): SMESHGUI_Info( parent ) myTree->setColumnCount( 2 ); myTree->header()->setStretchLastSection( true ); -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - myTree->header()->setResizeMode( 0, QHeaderView::ResizeToContents ); -#else myTree->header()->setSectionResizeMode( 0, QHeaderView::ResizeToContents ); -#endif myTree->header()->hide(); l->addWidget( myTree );