mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-15 00:04:00 -04:00
Disallow changing of map layer registry directly
QgsMapLayerRegistry::mapLayers() returned reference is now const
This commit is contained in:
parent
91f3ceab26
commit
35de29df9b
@ -26,7 +26,7 @@ class QgsMapLayerRegistry : QObject
|
||||
QList<QgsMapLayer *> mapLayersByName( QString layerName );
|
||||
|
||||
//! Retrieve the mapLayers collection (mainly intended for use by projection)
|
||||
QMap<QString, QgsMapLayer*> & mapLayers();
|
||||
const QMap<QString, QgsMapLayer*> & mapLayers();
|
||||
|
||||
/**
|
||||
* @brief
|
||||
|
@ -28,7 +28,7 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsCompos
|
||||
|
||||
// populate the layer list
|
||||
mAtlasCoverageLayerComboBox->clear();
|
||||
QMap< QString, QgsMapLayer * >& layers = QgsMapLayerRegistry::instance()->mapLayers();
|
||||
const QMap< QString, QgsMapLayer * >& layers = QgsMapLayerRegistry::instance()->mapLayers();
|
||||
int idx = 0;
|
||||
for ( QMap<QString, QgsMapLayer*>::const_iterator it = layers.begin(); it != layers.end(); ++it )
|
||||
{
|
||||
|
@ -104,7 +104,7 @@ QVector<QgsRasterCalculatorEntry> QgsRasterCalcDialog::rasterEntries() const
|
||||
|
||||
void QgsRasterCalcDialog::insertAvailableRasterBands()
|
||||
{
|
||||
QMap<QString, QgsMapLayer*>& layers = QgsMapLayerRegistry::instance()->mapLayers();
|
||||
const QMap<QString, QgsMapLayer*>& layers = QgsMapLayerRegistry::instance()->mapLayers();
|
||||
QMap<QString, QgsMapLayer*>::const_iterator layerIt = layers.constBegin();
|
||||
|
||||
bool firstLayer = true;
|
||||
|
@ -169,7 +169,7 @@ void QgsMapLayerRegistry::reloadAllLayers()
|
||||
}
|
||||
}
|
||||
|
||||
QMap<QString, QgsMapLayer*> & QgsMapLayerRegistry::mapLayers()
|
||||
const QMap<QString, QgsMapLayer*>& QgsMapLayerRegistry::mapLayers()
|
||||
{
|
||||
return mMapLayers;
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ class CORE_EXPORT QgsMapLayerRegistry : public QObject
|
||||
QList<QgsMapLayer *> mapLayersByName( QString layerName );
|
||||
|
||||
//! Retrieve the mapLayers collection (mainly intended for use by projection)
|
||||
QMap<QString, QgsMapLayer*> & mapLayers();
|
||||
const QMap<QString, QgsMapLayer*> & mapLayers();
|
||||
|
||||
/**
|
||||
* @brief
|
||||
|
@ -985,14 +985,14 @@ bool QgsProject::write()
|
||||
emit writeProject( *doc );
|
||||
|
||||
// within top level node save list of layers
|
||||
QMap<QString, QgsMapLayer*> & layers = QgsMapLayerRegistry::instance()->mapLayers();
|
||||
const QMap<QString, QgsMapLayer*> & layers = QgsMapLayerRegistry::instance()->mapLayers();
|
||||
|
||||
// Iterate over layers in zOrder
|
||||
// Call writeXML() on each
|
||||
QDomElement projectLayersNode = doc->createElement( "projectlayers" );
|
||||
projectLayersNode.setAttribute( "layercount", qulonglong( layers.size() ) );
|
||||
|
||||
QMap<QString, QgsMapLayer*>::iterator li = layers.begin();
|
||||
QMap<QString, QgsMapLayer*>::ConstIterator li = layers.constBegin();
|
||||
while ( li != layers.end() )
|
||||
{
|
||||
//QgsMapLayer *ml = QgsMapLayerRegistry::instance()->mapLayer(*li);
|
||||
|
Loading…
x
Reference in New Issue
Block a user