Skip to content
Permalink
Browse files

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

  • Loading branch information
andreasneumann authored and nyalldawson committed May 7, 2018
1 parent 52b9b9c commit e85740ce68fd241cf4d78cac4d506a8b69b1d86b
@@ -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 );
}


@@ -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 );
}
@@ -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 );
}
}

@@ -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 );
}
}

@@ -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 );
}
}
@@ -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

0 comments on commit e85740c

Please sign in to comment.
You can’t perform that action at this time.