Remove all use of deprecated Qt methods up to Qt 5.14

qgis · Oct 7, 2020 · 6da6a45 · 6da6a45
1 parent aa50eb0
commit 6da6a45
Show file tree

Hide file tree

Showing 69 changed files with 204 additions and 127 deletions.
diff --git a/src/app/3d/qgs3dmapcanvas.cpp b/src/app/3d/qgs3dmapcanvas.cpp
@@ -46,7 +46,7 @@ Qgs3DMapCanvas::Qgs3DMapCanvas( QWidget *parent )
   mNavigationWidget = new Qgs3DNavigationWidget( this );
 
   QHBoxLayout *hLayout = new QHBoxLayout( this );
-  hLayout->setMargin( 0 );
+  hLayout->setContentsMargins( 0, 0, 0, 0 );
   hLayout->addWidget( mContainer, 1 );
   hLayout->addWidget( mNavigationWidget );
   this->setOnScreenNavigationVisibility(

diff --git a/src/app/decorations/qgsdecorationgrid.cpp b/src/app/decorations/qgsdecorationgrid.cpp
@@ -267,7 +267,11 @@ void QgsDecorationGrid::render( const QgsMapSettings &mapSettings, QgsRenderCont
         hIt = horizontalLines.constBegin();
         for ( ; hIt != horizontalLines.constEnd(); ++hIt )
         {
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
           if ( hIt->second.intersect( vIt->second, &intersectionPoint ) == QLineF::BoundedIntersection )
+#else
+          if ( hIt->second.intersects( vIt->second, &intersectionPoint ) == QLineF::BoundedIntersection )
+#endif
           {
             mMarkerSymbol->renderPoint( intersectionPoint, nullptr, context );
           }
@@ -398,7 +402,11 @@ bool clipByRect( QLineF &line, const QPolygonF &rect )
   for ( ; it != borderLines.constEnd(); ++it )
   {
     QPointF intersectionPoint;
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     if ( it->intersect( line, &intersectionPoint ) == QLineF::BoundedIntersection )
+#else
+    if ( it->intersects( line, &intersectionPoint ) == QLineF::BoundedIntersection )
+#endif
     {
       intersectionList.push_back( intersectionPoint );
       if ( intersectionList.size() >= 2 )

diff --git a/src/app/georeferencer/qgsresidualplotitem.cpp b/src/app/georeferencer/qgsresidualplotitem.cpp
@@ -177,15 +177,23 @@ double QgsResidualPlotItem::maxMMToPixelRatioForGCP( const QgsGeorefDataPoint *p
   if ( residual.y() > 0 )
   {
     QLineF lowerFrameLine( 0, rect().height(), rect().width(), rect().height() );
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     if ( residualLine.intersect( lowerFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#else
+    if ( residualLine.intersects( lowerFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#endif
     {
       upDownDist = dist( QPointF( pixelXMM, pixelYMM ), intersectionPoint );
     }
   }
   else if ( residual.y() < 0 )
   {
     QLineF upperFrameLine( 0, 0, mExtent.xMaximum(), 0 );
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     if ( residualLine.intersect( upperFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#else
+    if ( residualLine.intersects( upperFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#endif
     {
       upDownDist = dist( QPointF( pixelXMM, pixelYMM ), intersectionPoint );
     }
@@ -195,15 +203,23 @@ double QgsResidualPlotItem::maxMMToPixelRatioForGCP( const QgsGeorefDataPoint *p
   if ( residual.x() > 0 )
   {
     QLineF rightFrameLine( rect().width(), 0, rect().width(), rect().height() );
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     if ( residualLine.intersect( rightFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#else
+    if ( residualLine.intersects( rightFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#endif
     {
       leftRightDist = dist( QPointF( pixelXMM, pixelYMM ), intersectionPoint );
     }
   }
   else if ( residual.x() < 0 )
   {
     QLineF leftFrameLine( 0, 0, 0, rect().height() );
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     if ( residualLine.intersect( leftFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#else
+    if ( residualLine.intersects( leftFrameLine, &intersectionPoint ) != QLineF::NoIntersection )
+#endif
     {
       leftRightDist = dist( QPointF( pixelXMM, pixelYMM ), intersectionPoint );
     }

diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -312,10 +312,8 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
   //create layout view
   QGridLayout *viewLayout = new QGridLayout();
   viewLayout->setSpacing( 0 );
-  viewLayout->setMargin( 0 );
   viewLayout->setContentsMargins( 0, 0, 0, 0 );
   centralWidget()->layout()->setSpacing( 0 );
-  centralWidget()->layout()->setMargin( 0 );
   centralWidget()->layout()->setContentsMargins( 0, 0, 0, 0 );
 
   mMessageBar = new QgsMessageBar( centralWidget() );

diff --git a/src/app/layout/qgsreportorganizerwidget.cpp b/src/app/layout/qgsreportorganizerwidget.cpp
@@ -49,7 +49,7 @@ QgsReportOrganizerWidget::QgsReportOrganizerWidget( QWidget *parent, QgsLayoutDe
 #endif
 
   QVBoxLayout *vLayout = new QVBoxLayout();
-  vLayout->setMargin( 0 );
+  vLayout->setContentsMargins( 0, 0, 0, 0 );
   vLayout->setSpacing( 0 );
   mSettingsFrame->setLayout( vLayout );
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1196,7 +1196,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
     QgsGui::instance()->enableAutoGeometryRestore( dialog );
     QVBoxLayout *layout = new QVBoxLayout( dialog );
     layout->addWidget( mSnappingDialog );
-    layout->setMargin( 0 );
+    layout->setContentsMargins( 0, 0, 0, 0 );
     mSnappingDialogContainer = dialog;
   }
   endProfile();
@@ -4794,7 +4794,6 @@ void QgisApp::initLayerTreeView()
   toolbar->addAction( mActionRemoveLayer );
 
   QVBoxLayout *vboxLayout = new QVBoxLayout;
-  vboxLayout->setMargin( 0 );
   vboxLayout->setContentsMargins( 0, 0, 0, 0 );
   vboxLayout->setSpacing( 0 );
   vboxLayout->addWidget( toolbar );

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -780,14 +780,10 @@ bool QgisAppInterface::openFeatureForm( QgsVectorLayer *vlayer, QgsFeature &f, b
 
 void QgisAppInterface::preloadForm( const QString &uifile )
 {
-  QSignalMapper *signalMapper = new QSignalMapper( this );
   mTimer = new QTimer( this );
 
-  connect( mTimer, SIGNAL( timeout() ), signalMapper, SLOT( map() ) );
-  connect( signalMapper, SIGNAL( mapped( QString ) ), mTimer, SLOT( stop() ) );
-  connect( signalMapper, SIGNAL( mapped( QString ) ), this, SLOT( cacheloadForm( QString ) ) );
-
-  signalMapper->setMapping( mTimer, uifile );
+  connect( mTimer, &QTimer::timeout, mTimer, &QTimer::stop );
+  connect( mTimer, &QTimer::timeout, this, [ = ] { cacheloadForm( uifile ); } );
 
   mTimer->start( 0 );
 }

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -318,7 +318,7 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
 
   private slots:
 
-    void cacheloadForm( const QString &uifile );
+    void cacheloadForm( const QString &uifile = QString() );
 
   private:
 

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -151,7 +151,6 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QgsAttr
 
   setAttribute( Qt::WA_DeleteOnClose );
 
-  layout()->setMargin( 0 );
   layout()->setContentsMargins( 0, 0, 0, 0 );
   static_cast< QGridLayout * >( layout() )->setVerticalSpacing( 0 );
 
@@ -1009,7 +1008,6 @@ void QgsAttributeTableDialog::toggleDockMode( bool docked )
 
     QVBoxLayout *vl = new QVBoxLayout();
     vl->setContentsMargins( 0, 0, 0, 0 );
-    vl->setMargin( 0 );
     vl->addWidget( this );
     mDialog->setLayout( vl );
 

diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp
@@ -50,7 +50,6 @@ QgsBookmarks::QgsBookmarks( QWidget *parent )
 
   connect( lstBookmarks, &QTreeView::doubleClicked, this, &QgsBookmarks::lstBookmarks_doubleClicked );
 
-  bookmarksDockContents->layout()->setMargin( 0 );
   bookmarksDockContents->layout()->setContentsMargins( 0, 0, 0, 0 );
   static_cast< QGridLayout * >( bookmarksDockContents->layout() )->setVerticalSpacing( 0 );
 

diff --git a/src/app/qgsfixattributedialog.cpp b/src/app/qgsfixattributedialog.cpp
@@ -32,7 +32,7 @@ void QgsFixAttributeDialog::init( QgsVectorLayer *layer, const QgsAttributeEdito
 {
   setWindowTitle( tr( "%1 - Fix Pasted Features" ).arg( layer->name() ) );
   setLayout( new QGridLayout() );
-  layout()->setMargin( 0 );
+  layout()->setContentsMargins( 0, 0, 0, 0 );
 
   mUnfixedFeatures = mFeatures;
   mCurrentFeature = mFeatures.begin();

diff --git a/src/app/qgsmapcanvasdockwidget.cpp b/src/app/qgsmapcanvasdockwidget.cpp
@@ -44,7 +44,6 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
   setAttribute( Qt::WA_DeleteOnClose );
 
   mContents->layout()->setContentsMargins( 0, 0, 0, 0 );
-  mContents->layout()->setMargin( 0 );
   static_cast< QVBoxLayout * >( mContents->layout() )->setSpacing( 0 );
 
   setWindowTitle( name );
@@ -67,7 +66,6 @@ QgsMapCanvasDockWidget::QgsMapCanvasDockWidget( const QString &name, QWidget *pa
 
   mMainWidget->setLayout( new QVBoxLayout() );
   mMainWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
-  mMainWidget->layout()->setMargin( 0 );
 
   mMainWidget->layout()->addWidget( mMapCanvas );
 

diff --git a/src/app/qgsrelationadddlg.cpp b/src/app/qgsrelationadddlg.cpp
@@ -39,7 +39,7 @@ QgsFieldPairWidget::QgsFieldPairWidget( int index, QWidget *parent )
   , mEnabled( index == 0 )
 {
   mLayout = new QHBoxLayout();
-  mLayout->setMargin( 0 );
+  mLayout->setContentsMargins( 0, 0, 0, 0 );
 
   mAddButton = new QToolButton( this );
   mAddButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/symbologyAdd.svg" ) ) );

diff --git a/src/app/qgsselectbyformdialog.cpp b/src/app/qgsselectbyformdialog.cpp
@@ -37,7 +37,6 @@ QgsSelectByFormDialog::QgsSelectByFormDialog( QgsVectorLayer *layer, const QgsAt
   mForm->setMode( QgsAttributeEditorContext::SearchMode );
 
   QVBoxLayout *vLayout = new QVBoxLayout();
-  vLayout->setMargin( 0 );
   vLayout->setContentsMargins( 0, 0, 0, 0 );
   setLayout( vLayout );
 

diff --git a/src/app/qgswelcomepage.cpp b/src/app/qgswelcomepage.cpp
@@ -50,7 +50,6 @@ QgsWelcomePage::QgsWelcomePage( bool skipVersionCheck, QWidget *parent )
   QgsSettings settings;
 
   QVBoxLayout *mainLayout = new QVBoxLayout;
-  mainLayout->setMargin( 0 );
   mainLayout->setContentsMargins( 0, 0, 0, 0 );
   setLayout( mainLayout );
 
@@ -60,7 +59,6 @@ QgsWelcomePage::QgsWelcomePage( bool skipVersionCheck, QWidget *parent )
   QWidget *leftContainer = new QWidget();
   QVBoxLayout *leftLayout = new QVBoxLayout;
   leftLayout->setContentsMargins( 0, 0, 0, 0 );
-  leftLayout->setMargin( 0 );
 
   int titleSize = static_cast<int>( QApplication::fontMetrics().height() * 1.4 );
   mRecentProjectsTitle = new QLabel( QStringLiteral( "<div style='font-size:%1px;font-weight:bold'>%2</div>" ).arg( QString::number( titleSize ), tr( "Recent Projects" ) ) );
@@ -90,7 +88,6 @@ QgsWelcomePage::QgsWelcomePage( bool skipVersionCheck, QWidget *parent )
   QWidget *rightContainer = new QWidget();
   QVBoxLayout *rightLayout = new QVBoxLayout;
   rightLayout->setContentsMargins( 0, 0, 0, 0 );
-  rightLayout->setMargin( 0 );
 
   if ( !QgsSettings().value( QStringLiteral( "%1/disabled" ).arg( QgsNewsFeedParser::keyForFeed( QStringLiteral( FEED_URL ) ) ), false, QgsSettings::Core ).toBool() )
   {
@@ -99,7 +96,6 @@ QgsWelcomePage::QgsWelcomePage( bool skipVersionCheck, QWidget *parent )
     QWidget *newsContainer = new QWidget();
     QVBoxLayout *newsLayout = new QVBoxLayout();
     newsLayout->setContentsMargins( 0, 0, 0, 0 );
-    newsLayout->setMargin( 0 );
     mNewsFeedTitle = new QLabel( QStringLiteral( "<div style='font-size:%1px;font-weight:bold'>%2</div>" ).arg( titleSize ).arg( tr( "News" ) ) );
     mNewsFeedTitle->setContentsMargins( titleSize / 2, titleSize / 6, 0, 0 );
     newsLayout->addWidget( mNewsFeedTitle, 0 );
@@ -127,7 +123,6 @@ QgsWelcomePage::QgsWelcomePage( bool skipVersionCheck, QWidget *parent )
   QWidget *templateContainer = new QWidget();
   QVBoxLayout *templateLayout = new QVBoxLayout();
   templateLayout->setContentsMargins( 0, 0, 0, 0 );
-  templateLayout->setMargin( 0 );
   QLabel *templatesTitle = new QLabel( QStringLiteral( "<div style='font-size:%1px;font-weight:bold'>%2</div>" ).arg( titleSize ).arg( tr( "Project Templates" ) ) );
   templatesTitle->setContentsMargins( titleSize / 2, titleSize / 6, 0, 0 );
   templateLayout->addWidget( templatesTitle, 0 );

diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp
@@ -174,19 +174,32 @@ void QgsTextDiagram::renderDiagram( const QgsFeature &feature, QgsRenderContext
         QLineF verticalLine( baseX + w / nCategories * i, baseY + h, baseX + w / nCategories * i, baseY );
         if ( baseX + w / nCategories * i < baseX + w / 2.0 )
         {
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
           verticalLine.intersect( triangleEdgeLeft, &intersectionPoint1 );
+#else
+          verticalLine.intersects( triangleEdgeLeft, &intersectionPoint1 );
+#endif
         }
         else
         {
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
           verticalLine.intersect( triangleEdgeRight, &intersectionPoint1 );
+#else
+          verticalLine.intersects( triangleEdgeRight, &intersectionPoint1 );
+#endif
         }
         p->drawLine( QPointF( baseX + w / nCategories * i, baseY + h ), intersectionPoint1 );
       }
       else //vertical
       {
         QLineF horizontalLine( baseX, baseY + h / nCategories * i, baseX + w, baseY + h / nCategories * i );
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
         horizontalLine.intersect( triangleEdgeLeft, &intersectionPoint1 );
         horizontalLine.intersect( triangleEdgeRight, &intersectionPoint2 );
+#else
+        horizontalLine.intersects( triangleEdgeLeft, &intersectionPoint1 );
+        horizontalLine.intersects( triangleEdgeRight, &intersectionPoint2 );
+#endif
         p->drawLine( intersectionPoint1, intersectionPoint2 );
       }
     }

diff --git a/src/core/labeling/qgspallabeling.cpp b/src/core/labeling/qgspallabeling.cpp
@@ -1331,7 +1331,11 @@ QPixmap QgsPalLayerSettings::labelSettingsPreviewPixmap( const QgsPalLayerSettin
   textRect.setTop( bottom - textHeight );
   textRect.setBottom( bottom );
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
   const double iconWidth = QFontMetricsF( QFont() ).width( 'X' ) * Qgis::UI_SCALE_FACTOR;
+#else
+  const double iconWidth = QFontMetricsF( QFont() ).horizontalAdvance( 'X' ) * Qgis::UI_SCALE_FACTOR;
+#endif
 
   if ( settings.callout() && settings.callout()->enabled() )
   {
@@ -1520,7 +1524,11 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF *fm, const QSt
   {
     QString dirSym = leftDirSymb;
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
     if ( fm->width( rightDirSymb ) > fm->width( dirSym ) )
+#else
+    if ( fm->horizontalAdvance( rightDirSymb ) > fm->horizontalAdvance( dirSym ) )
+#endif
       dirSym = rightDirSymb;
 
     switch ( placeDirSymb )
@@ -1561,7 +1569,11 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF *fm, const QSt
 
       for ( const auto &line : multiLineSplit )
       {
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
         w = std::max( w, fm->width( line ) );
+#else
+        w = std::max( w, fm->horizontalAdvance( line ) );
+#endif
       }
       break;
     }
@@ -1586,7 +1598,11 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF *fm, const QSt
       double widthHorizontal = 0.0;
       for ( const auto &line : multiLineSplit )
       {
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
         widthHorizontal = std::max( w, fm->width( line ) );
+#else
+        widthHorizontal = std::max( w, fm->horizontalAdvance( line ) );
+#endif
       }
 
       double widthVertical = 0.0;

diff --git a/src/core/labeling/qgstextlabelfeature.cpp b/src/core/labeling/qgstextlabelfeature.cpp
@@ -109,7 +109,11 @@ void QgsTextLabelFeature::calculateInfo( bool curvedLabeling, QFontMetricsF *fm,
   {
     // reconstruct how Qt creates word spacing, then adjust per individual stored character
     // this will allow PAL to create each candidate width = character width + correct spacing
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
     charWidth = fm->width( mClusters[i] );
+#else
+    charWidth = fm->horizontalAdvance( mClusters[i] );
+#endif
     if ( curvedLabeling )
     {
       wordSpaceFix = qreal( 0.0 );
@@ -121,14 +125,23 @@ void QgsTextLabelFeature::calculateInfo( bool curvedLabeling, QFontMetricsF *fm,
       }
       // this workaround only works for clusters with a single character. Not sure how it should be handled
       // with multi-character clusters.
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
       if ( mClusters[i].length() == 1 &&
            !qgsDoubleNear( fm->width( QString( mClusters[i].at( 0 ) ) ), fm->width( mClusters[i].at( 0 ) ) + letterSpacing ) )
+#else
+      if ( mClusters[i].length() == 1 &&
+           !qgsDoubleNear( fm->horizontalAdvance( QString( mClusters[i].at( 0 ) ) ), fm->horizontalAdvance( mClusters[i].at( 0 ) ) + letterSpacing ) )
+#endif
       {
         // word spacing applied when it shouldn't be
         wordSpaceFix -= wordSpacing;
       }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
       charWidth = fm->width( QString( mClusters[i] ) ) + wordSpaceFix;
+#else
+      charWidth = fm->horizontalAdvance( QString( mClusters[i] ) ) + wordSpaceFix;
+#endif
     }
 
     double labelWidth = mapScale * charWidth;