sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-04 00:04:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate QgsDataProvider::dataChanged( int ) signal

Browse Source 
Was not needed and not emitted anywhere
This commit is contained in:
Nyall Dawson 2016-11-14 15:29:00 +10:00
parent 4a5faa083f
commit 5d78d60bf3
8 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/api_break.dox
View File

@ -668,6 +668,12 @@ QgsDataItem {#qgis_api_break_3_0_QgsDataItem}
- emitBeginInsertItems(), emitEndInsertItems(), emitBeginRemoveItems(), emitEndRemoveItems(), emitDataChanged(), emitStateChanged() have been removed.
- Favourites was renamed to Favorites
QgsDataProvider {#qgis_api_break_3_0_QgsDataProvider}
---------------
- The duplicate (and unused) dataChanged( int ) signal was removed. Use dataChanged() instead.
QgsDataSourceURI {#qgis_api_break_3_0_QgsDatasourceUri}
----------------

6
python/core/qgsdataprovider.sip
View File

@ -326,12 +326,6 @@ class QgsDataProvider : QObject
*/
void dataChanged();
/**
* This is emitted whenever data or metadata (e.g. color table, extent) has changed
* @param changed binary combination of changes
*/
void dataChanged( int changed );
protected:
/** Add error message */

4
src/app/qgisapp.cpp
View File

@ -10258,8 +10258,8 @@ void QgisApp::layersWereAdded( const QList<QgsMapLayer *>& theLayers )
if ( provider )
{
connect( provider, SIGNAL( dataChanged() ), layer, SLOT( triggerRepaint() ) );
connect( provider, SIGNAL( dataChanged() ), mMapCanvas, SLOT( refresh() ) );
connect( provider, &QgsDataProvider::dataChanged, layer, &QgsMapLayer::triggerRepaint );
connect( provider, &QgsDataProvider::dataChanged, mMapCanvas, &QgsMapCanvas::refresh );
}
}
}

4
src/browser/qgsbrowser.cpp
View File

@ -442,8 +442,8 @@ void QgsBrowser::updateCurrentTab()
QgsRasterLayer *rlayer = qobject_cast< QgsRasterLayer * >( mLayer );
if ( rlayer )
{
connect( rlayer->dataProvider(), SIGNAL( dataChanged() ), rlayer, SLOT( triggerRepaint() ) );
connect( rlayer->dataProvider(), SIGNAL( dataChanged() ), mapCanvas, SLOT( refresh() ) );
connect( rlayer->dataProvider(), &QgsRasterDataProvider::dataChanged, rlayer, &QgsRasterLayer::triggerRepaint );
connect( rlayer->dataProvider(), &QgsRasterDataProvider::dataChanged, mapCanvas, &QgsMapCanvas::refresh );
}
}
mDirtyPreview = false;

6
src/core/qgsdataprovider.h
View File

@ -415,12 +415,6 @@ class CORE_EXPORT QgsDataProvider : public QObject
*/
void dataChanged();
/**
* This is emitted whenever data or metadata (e.g. color table, extent) has changed
* @param changed binary combination of changes
*/
void dataChanged( int changed );
protected:
/**

2
src/core/qgspointlocator.cpp
View File

@ -631,7 +631,7 @@ QgsPointLocator::QgsPointLocator( QgsVectorLayer* layer, const QgsCoordinateRefe
connect( mLayer, SIGNAL( featureAdded( QgsFeatureId ) ), this, SLOT( onFeatureAdded( QgsFeatureId ) ) );
connect( mLayer, SIGNAL( featureDeleted( QgsFeatureId ) ), this, SLOT( onFeatureDeleted( QgsFeatureId ) ) );
connect( mLayer, SIGNAL( geometryChanged( QgsFeatureId, const QgsGeometry& ) ), this, SLOT( onGeometryChanged( QgsFeatureId, const QgsGeometry& ) ) );
connect( mLayer, SIGNAL( dataChanged() ), this, SLOT( destroyIndex() ) );
connect( mLayer, &QgsVectorLayer::dataChanged, this, &QgsPointLocator::destroyIndex );
}

2
src/core/qgstransaction.cpp
View File

@ -112,7 +112,7 @@ bool QgsTransaction::addLayer( QgsVectorLayer* layer )
return false;
}
connect( this, SIGNAL( afterRollback() ), layer->dataProvider(), SIGNAL( dataChanged() ) );
connect( this, &QgsTransaction::afterRollback, layer->dataProvider(), &QgsVectorDataProvider::dataChanged );
connect( QgsMapLayerRegistry::instance(), SIGNAL( layersWillBeRemoved( QStringList ) ), this, SLOT( onLayersDeleted( QStringList ) ) );
mLayers.insert( layer );

4
src/core/qgsvectorlayer.cpp
View File

@ -1628,8 +1628,8 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
mDataSource.chop( 10 );
}
connect( mDataProvider, SIGNAL( dataChanged() ), this, SIGNAL( dataChanged() ) );
connect( mDataProvider, SIGNAL( dataChanged() ), this, SLOT( removeSelection() ) );
connect( mDataProvider, &QgsVectorDataProvider::dataChanged, this, &QgsVectorLayer::dataChanged );
connect( mDataProvider, &QgsVectorDataProvider::dataChanged, this, &QgsVectorLayer::removeSelection );
return true;
} // QgsVectorLayer:: setDataProvider