More qt deprecation warning fixes

qgis · Jan 28, 2020 · f5e1733 · f5e1733
1 parent 08adb23
commit f5e1733
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/core/layout/qgslayoutitemmapitem.cpp b/src/core/layout/qgslayoutitemmapitem.cpp
@@ -184,7 +184,11 @@ void QgsLayoutItemMapItemStack::moveItemUp( const QString &itemId )
   {
     return;
   }
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
   mItems.swap( index, index + 1 );
+#else
+  mItems.swapItemsAt( index, index + 1 );
+#endif
 }
 
 void QgsLayoutItemMapItemStack::moveItemDown( const QString &itemId )
@@ -200,7 +204,11 @@ void QgsLayoutItemMapItemStack::moveItemDown( const QString &itemId )
   {
     return;
   }
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
   mItems.swap( index, index - 1 );
+#else
+  mItems.swapItemsAt( index, index - 1 );
+#endif
 }
 
 QgsLayoutItemMapItem *QgsLayoutItemMapItemStack::item( const QString &itemId ) const

diff --git a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp
@@ -33,7 +33,7 @@ QgsValueMapConfigDlg::QgsValueMapConfigDlg( QgsVectorLayer *vl, int fieldIdx, QW
 
   tableWidget->insertRow( 0 );
 
-  tableWidget->horizontalHeader()->setClickable( true );
+  tableWidget->horizontalHeader()->setSectionsClickable( true );
   tableWidget->setSortingEnabled( true );
 
   connect( addNullButton, &QAbstractButton::clicked, this, &QgsValueMapConfigDlg::addNullButtonPushed );

diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
@@ -161,9 +161,9 @@ void QgsValueRelationWidgetWrapper::initWidget( QWidget *editor )
   }
   else if ( mTableWidget )
   {
-    mTableWidget->horizontalHeader()->setResizeMode( QHeaderView::Stretch );
+    mTableWidget->horizontalHeader()->setSectionResizeMode( QHeaderView::Stretch );
     mTableWidget->horizontalHeader()->setVisible( false );
-    mTableWidget->verticalHeader()->setResizeMode( QHeaderView::Stretch );
+    mTableWidget->verticalHeader()->setSectionResizeMode( QHeaderView::Stretch );
     mTableWidget->verticalHeader()->setVisible( false );
     mTableWidget->setShowGrid( false );
     mTableWidget->setEditTriggers( QAbstractItemView::NoEditTriggers );

diff --git a/src/gui/processing/qgsprocessingconfigurationwidgets.cpp b/src/gui/processing/qgsprocessingconfigurationwidgets.cpp
@@ -42,7 +42,7 @@ QgsFilterAlgorithmConfigurationWidget::QgsFilterAlgorithmConfigurationWidget( QW
   mOutputExpressionWidget->setHorizontalHeaderItem( 0, new QTableWidgetItem( tr( "Output Name" ) ) );
   mOutputExpressionWidget->setHorizontalHeaderItem( 1, new QTableWidgetItem( tr( "Filter Expression" ) ) );
   mOutputExpressionWidget->setHorizontalHeaderItem( 2, new QTableWidgetItem( tr( "Final Output" ) ) );
-  mOutputExpressionWidget->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch );
+  mOutputExpressionWidget->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Stretch );
   QGridLayout *layout = new QGridLayout();
   setLayout( layout );