Fixes Centos7 issues due to old gcc compiler (gcc 4.8.5)

andreasneumann · nyalldawson · commit e85740ce68fd · 2018-05-08T06:42:19.000+10:00
diff --git a/src/core/layertree/qgslayertreelayer.cpp b/src/core/layertree/qgslayertreelayer.cpp
@@ -69,8 +69,8 @@ void QgsLayerTreeLayer::attachToLayer()
   if ( !mRef )
     return;
 
-  connect( mRef.layer, &QgsMapLayer::nameChanged, this, &QgsLayerTreeLayer::layerNameChanged );
-  connect( mRef.layer, &QgsMapLayer::willBeDeleted, this, &QgsLayerTreeLayer::layerWillBeDeleted );
+  connect( mRef.layer.data(), &QgsMapLayer::nameChanged, this, &QgsLayerTreeLayer::layerNameChanged );
+  connect( mRef.layer.data(), &QgsMapLayer::willBeDeleted, this, &QgsLayerTreeLayer::layerWillBeDeleted );
 }
 
 
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -1367,7 +1367,7 @@ void QgsLayoutItemMap::connectUpdateSlot()
     } );
 
   }
-  connect( mLayout, &QgsLayout::refreshed, this, &QgsLayoutItemMap::invalidateCache );
+  connect( mLayout.data(), &QgsLayout::refreshed, this, &QgsLayoutItemMap::invalidateCache );
 
   connect( project->mapThemeCollection(), &QgsMapThemeCollection::mapThemeChanged, this, &QgsLayoutItemMap::mapThemeChanged );
 }
diff --git a/src/core/layout/qgslayoutitemmapoverview.cpp b/src/core/layout/qgslayoutitemmapoverview.cpp
@@ -217,8 +217,8 @@ void QgsLayoutItemMapOverview::setLinkedMap( QgsLayoutItemMap *map )
   //disconnect old map
   if ( mFrameMap )
   {
-    disconnect( mFrameMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
-    disconnect( mFrameMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
+    disconnect( mFrameMap.data(), &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
+    disconnect( mFrameMap.data(), &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
   }
   mFrameMap = map;
   //connect to new map signals
@@ -240,8 +240,8 @@ void QgsLayoutItemMapOverview::connectSignals()
 
   if ( mFrameMap )
   {
-    connect( mFrameMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
-    connect( mFrameMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
+    connect( mFrameMap.data(), &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
+    connect( mFrameMap.data(), &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );
   }
 }
 
diff --git a/src/core/layout/qgslayoutitempicture.cpp b/src/core/layout/qgslayoutitempicture.cpp
@@ -839,12 +839,12 @@ void QgsLayoutItemPicture::finalizeRestoreFromXml()
   {
     if ( mRotationMap )
     {
-      disconnectMap( mRotationMap );
+      disconnectMap( mRotationMap.data() );
     }
     if ( ( mRotationMap = qobject_cast< QgsLayoutItemMap * >( mLayout->itemByUuid( mRotationMapUuid, true ) ) ) )
     {
-      connect( mRotationMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemPicture::updateMapRotation );
-      connect( mRotationMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemPicture::updateMapRotation );
+      connect( mRotationMap.data(), &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemPicture::updateMapRotation );
+      connect( mRotationMap.data(), &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemPicture::updateMapRotation );
     }
   }
 
diff --git a/src/core/layout/qgslayoutobject.cpp b/src/core/layout/qgslayoutobject.cpp
@@ -93,7 +93,7 @@ QgsLayoutObject::QgsLayoutObject( QgsLayout *layout )
 
   if ( mLayout )
   {
-    connect( mLayout, &QgsLayout::refreshed, this, &QgsLayoutObject::refresh );
+    connect( mLayout.data(), &QgsLayout::refreshed, this, &QgsLayoutObject::refresh );
     connect( &mLayout->reportContext(), &QgsLayoutReportContext::changed, this, &QgsLayoutObject::refresh );
   }
 }
diff --git a/tests/src/core/testqgstaskmanager.cpp b/tests/src/core/testqgstaskmanager.cpp
@@ -537,8 +537,8 @@ void TestQgsTaskManager::subTask()
   }
 
   QSignalSpy parentTerminated( parent, &QgsTask::taskTerminated );
-  QSignalSpy subTerminated( subTask, &QgsTask::taskTerminated );
-  QSignalSpy subsubTerminated( subsubTask, &QgsTask::taskTerminated );
+  QSignalSpy subTerminated( subTask.data(), &QgsTask::taskTerminated );
+  QSignalSpy subsubTerminated( subsubTask.data(), &QgsTask::taskTerminated );
 
   subsubTask->terminate();
   while ( subsubTask->status() == QgsTask::Running
@@ -577,8 +577,8 @@ void TestQgsTaskManager::subTask()
   QCOMPARE( ( int )subTask->status(), ( int )QgsTask::Running );
 
   QSignalSpy parentFinished( parent, &QgsTask::taskCompleted );
-  QSignalSpy subFinished( subTask, &QgsTask::taskCompleted );
-  QSignalSpy subsubFinished( subsubTask, &QgsTask::taskCompleted );
+  QSignalSpy subFinished( subTask.data(), &QgsTask::taskCompleted );
+  QSignalSpy subsubFinished( subsubTask.data(), &QgsTask::taskCompleted );
 
   subsubTask->finish();
   while ( subsubTask->status() == QgsTask::Running

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ void QgsLayerTreeLayer::attachToLayer()`
`69`	`69`	`if ( !mRef )`
`70`	`70`	`return;`
`71`	`71`
`72`		`- connect( mRef.layer, &QgsMapLayer::nameChanged, this, &QgsLayerTreeLayer::layerNameChanged );`
`73`		`- connect( mRef.layer, &QgsMapLayer::willBeDeleted, this, &QgsLayerTreeLayer::layerWillBeDeleted );`
	`72`	`+ connect( mRef.layer.data(), &QgsMapLayer::nameChanged, this, &QgsLayerTreeLayer::layerNameChanged );`
	`73`	`+ connect( mRef.layer.data(), &QgsMapLayer::willBeDeleted, this, &QgsLayerTreeLayer::layerWillBeDeleted );`
`74`	`74`	`}`
`75`	`75`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -1367,7 +1367,7 @@ void QgsLayoutItemMap::connectUpdateSlot()`
`1367`	`1367`	`} );`
`1368`	`1368`
`1369`	`1369`	`}`
`1370`		`- connect( mLayout, &QgsLayout::refreshed, this, &QgsLayoutItemMap::invalidateCache );`
	`1370`	`+ connect( mLayout.data(), &QgsLayout::refreshed, this, &QgsLayoutItemMap::invalidateCache );`
`1371`	`1371`
`1372`	`1372`	`connect( project->mapThemeCollection(), &QgsMapThemeCollection::mapThemeChanged, this, &QgsLayoutItemMap::mapThemeChanged );`
`1373`	`1373`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,8 @@ void QgsLayoutItemMapOverview::setLinkedMap( QgsLayoutItemMap *map )`
`217`	`217`	`//disconnect old map`
`218`	`218`	`if ( mFrameMap )`
`219`	`219`	`{`
`220`		`- disconnect( mFrameMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
`221`		`- disconnect( mFrameMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
	`220`	`+ disconnect( mFrameMap.data(), &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
	`221`	`+ disconnect( mFrameMap.data(), &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
`222`	`222`	`}`
`223`	`223`	`mFrameMap = map;`
`224`	`224`	`//connect to new map signals`
`@@ -240,8 +240,8 @@ void QgsLayoutItemMapOverview::connectSignals()`
`240`	`240`
`241`	`241`	`if ( mFrameMap )`
`242`	`242`	`{`
`243`		`- connect( mFrameMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
`244`		`- connect( mFrameMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
	`243`	`+ connect( mFrameMap.data(), &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
	`244`	`+ connect( mFrameMap.data(), &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemMapOverview::overviewExtentChanged );`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`
Original file line number	Diff line number	Diff line change
`@@ -839,12 +839,12 @@ void QgsLayoutItemPicture::finalizeRestoreFromXml()`
`839`	`839`	`{`
`840`	`840`	`if ( mRotationMap )`
`841`	`841`	`{`
`842`		`- disconnectMap( mRotationMap );`
	`842`	`+ disconnectMap( mRotationMap.data() );`
`843`	`843`	`}`
`844`	`844`	`if ( ( mRotationMap = qobject_cast< QgsLayoutItemMap * >( mLayout->itemByUuid( mRotationMapUuid, true ) ) ) )`
`845`	`845`	`{`
`846`		`- connect( mRotationMap, &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemPicture::updateMapRotation );`
`847`		`- connect( mRotationMap, &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemPicture::updateMapRotation );`
	`846`	`+ connect( mRotationMap.data(), &QgsLayoutItemMap::mapRotationChanged, this, &QgsLayoutItemPicture::updateMapRotation );`
	`847`	`+ connect( mRotationMap.data(), &QgsLayoutItemMap::extentChanged, this, &QgsLayoutItemPicture::updateMapRotation );`
`848`	`848`	`}`
`849`	`849`	`}`
`850`	`850`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ QgsLayoutObject::QgsLayoutObject( QgsLayout *layout )`
`93`	`93`
`94`	`94`	`if ( mLayout )`
`95`	`95`	`{`
`96`		`- connect( mLayout, &QgsLayout::refreshed, this, &QgsLayoutObject::refresh );`
	`96`	`+ connect( mLayout.data(), &QgsLayout::refreshed, this, &QgsLayoutObject::refresh );`
`97`	`97`	`connect( &mLayout->reportContext(), &QgsLayoutReportContext::changed, this, &QgsLayoutObject::refresh );`
`98`	`98`	`}`
`99`	`99`	`}`