Fix all 3 arg lambda problems

qgis · Nov 4, 2019 · a638603 · a638603
1 parent cffea8b
commit a638603
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.ci/travis/linux/scripts/docker-qgis-build.sh b/.ci/travis/linux/scripts/docker-qgis-build.sh
@@ -55,12 +55,12 @@ cmake \
  -DDISABLE_DEPRECATED=ON \
  -DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s"\
  -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
+ -DWERROR=TRUE \
  -DADD_CLAZY_CHECKS=ON \
  -DQT5_3DEXTRA_LIBRARY="/usr/lib/x86_64-linux-gnu/libQt53DExtras.so" \
  -DQT5_3DEXTRA_INCLUDE_DIR="/root/QGIS/external/qt3dextra-headers" \
  -DCMAKE_PREFIX_PATH="/root/QGIS/external/qt3dextra-headers/cmake" \
  ..
-# -DWERROR=TRUE \
 echo "travis_fold:end:cmake"
 
 #######

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -758,7 +758,7 @@ IF (WITH_CORE)
   MARK_AS_ADVANCED (ADD_CLAZY_CHECKS)
   IF (ADD_CLAZY_CHECKS)
   SET(CMAKE_CXX_BASE_FLAGS "${CMAKE_CXX_FLAGS}")
-  SET(CLAZY_BASE_CHECKS "lambda-unique-connection,connect-3arg-lambda")
+  SET(CLAZY_BASE_CHECKS "connect-3arg-lambda")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_BASE_FLAGS} -Xclang -plugin-arg-clazy -Xclang ${CLAZY_BASE_CHECKS}")
   ENDIF (ADD_CLAZY_CHECKS)
 ENDIF (WITH_CORE)

diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp
@@ -104,7 +104,7 @@ QgsMapSaveDialog::QgsMapSaveDialog( QWidget *parent, QgsMapCanvas *mapCanvas, co
       {
         mInfoDetails = tr( "The following layer(s) use advanced effects:\n\n%1\n\nRasterizing map is recommended for proper rendering." ).arg(
                          QChar( 0x2022 ) + QStringLiteral( " " ) + layers.join( QStringLiteral( "\n" ) + QChar( 0x2022 ) + QStringLiteral( " " ) ) );
-        connect( mInfo, &QLabel::linkActivated, [this]( const QString & )
+        connect( mInfo, &QLabel::linkActivated, this, [this]( const QString & )
         {
           QgsMessageViewer *viewer = new QgsMessageViewer( this );
           viewer->setWindowTitle( tr( "Advanced effects warning" ) );

diff --git a/src/app/qgssnappingwidget.cpp b/src/app/qgssnappingwidget.cpp
@@ -175,7 +175,7 @@ QgsSnappingWidget::QgsSnappingWidget( QgsProject *project, QgsMapCanvas *canvas,
   connect( mUnitsComboBox, qgis::overload<int>::of( &QComboBox::currentIndexChanged ),
            this, &QgsSnappingWidget::changeUnit );
 
-  connect( mCanvas, &QgsMapCanvas::destinationCrsChanged, [ = ]
+  connect( mCanvas, &QgsMapCanvas::destinationCrsChanged, this, [ = ]
   {
     // Update map units from canvas
     const QString mapCanvasDistanceUnits { QgsUnitTypes::toString( mCanvas->mapSettings().mapUnits() ) };

diff --git a/tests/src/gui/testqgsrelationreferencewidget.cpp b/tests/src/gui/testqgsrelationreferencewidget.cpp
@@ -361,7 +361,7 @@ void TestQgsRelationReferenceWidget::testIdentifyOnMap()
   // Populate model (I tried to listen to signals but the module reload() runs twice
   // (the first load triggers a second one which does the population of the combo)
   // and I haven't fin a way to properly wait for it.
-  QTimer::singleShot( 300, [&] { loop.quit(); } );
+  QTimer::singleShot( 300, this, [&] { loop.quit(); } );
   loop.exec();
   QgsFeature feature;
   mLayer2->getFeatures( QStringLiteral( "pk = %1" ).arg( 11 ) ).nextFeature( feature );