Skip to content

Commit 3734712

Browse files
committed
rename metadata() to htmlMetadata() in QgsRasterDataProvider
1 parent 0b3f86d commit 3734712

15 files changed

+23
-23
lines changed

doc/api_break.dox

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,8 @@ QgsAuthManager {#qgis_api_break_3_0_QgsAuthManager}
560560
- getCertIdentity() was renamed to certIdentity()
561561
- getCertIdentityBundle() was renamed to certIdentityBundle()
562562
- getCertIdentityBundleToPem() was renamed to certIdentityBundleToPem()
563-
- getCertIdentities() was renamed to certIdentities()
564-
- getCertIdentityIds() was renamed to certIdentityIds()
563+
- getCertIdentities() was renamed to certIdentities()
564+
- getCertIdentityIds() was renamed to certIdentityIds()
565565
- getSslCertCustomConfig() was renamed to sslCertCustomConfig()
566566
- getSslCertCustomConfigByHost() was renamed to sslCertCustomConfigByHost()
567567
- getSslCertCustomConfigs() was renamed to sslCertCustomConfigs()
@@ -573,8 +573,8 @@ QgsAuthManager {#qgis_api_break_3_0_QgsAuthManager}
573573
- getMappedDatabaseCAs() was renamed to mappedDatabaseCAs()
574574
- getCaCertsCache() was renamed to caCertsCache()
575575
- getCertTrustPolicy() was renamed to certTrustPolicy()
576-
- getCertificateTrustPolicy() was renamed to certificateTrustPolicy()
577-
- getCertTrustCache() was renamed to certTrustCache()
576+
- getCertificateTrustPolicy() was renamed to certificateTrustPolicy()
577+
- getCertTrustCache() was renamed to certTrustCache()
578578
- getTrustedCaCerts() was renamed to trustedCaCerts()
579579
- getUntrustedCaCerts() was renamed to untrustedCaCerts()
580580
- getTrustedCaCertsCache() was renamed to trustedCaCertsCache()
@@ -1406,7 +1406,7 @@ QgsGraphEdge {#qgis_api_break_3_0_QgsGraphEdge}
14061406
------------
14071407

14081408
- outVertex() was renamed as toVertex() (yes, the original name was the opposite of the returned value!)
1409-
- inVertex() was renamed as fromVertex() (yes, the original name was the opposite of the returned value!)
1409+
- inVertex() was renamed as fromVertex() (yes, the original name was the opposite of the returned value!)
14101410

14111411

14121412
QgsGraphVertex {#qgis_api_break_3_0_QgsGraphVertex}
@@ -1669,7 +1669,7 @@ screenUpdateRequested() were removed. These members have had no effect for a num
16691669
- readStyle() and writeStyle() expect QgsReadWriteContext reference as the last argument
16701670
- readXml() and writeXml() expect QgsReadWriteContext reference as the last argument
16711671
- the invalidTransformInput() slot was removed - calling this slot had no effect
1672-
- metadata() was renamed to htmlMetadata()
1672+
- metadata() was renamed to htmlMetadata() in both QgsMapLayer and QgsRasterDataProvider
16731673
- setMaximumScale() and setMinimumScale(), maximumScale() and minimumScale() had the opposite meaning to other min/max scales in the API, and their definitions have now been swapped. setMaximumScale
16741674
now sets the maximum (i.e. largest scale, or most zoomed in) at which the layer will appear, and setMinimumScale now sets the minimum (i.e. smallest scale,
16751675
or most zoomed out) at which the layer will appear. The same is true for the maximumScale and minimumScale getters.

python/core/raster/qgsrasterdataprovider.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ Get list of user no data value ranges
227227
:rtype: bool
228228
%End
229229

230-
virtual QString metadata() = 0;
230+
virtual QString htmlMetadata() = 0;
231231
%Docstring
232232
Get metadata in a format suitable for feeding directly
233233
into a subset of the GUI raster properties "Metadata" tab.

src/core/raster/qgsrasterdataprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ QString QgsRasterDataProvider::makeTableCells( QStringList const &values )
258258
return s;
259259
} // makeTableCell_
260260

261-
QString QgsRasterDataProvider::metadata()
261+
QString QgsRasterDataProvider::htmlMetadata()
262262
{
263263
QString s;
264264
return s;

src/core/raster/qgsrasterdataprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
300300
* Get metadata in a format suitable for feeding directly
301301
* into a subset of the GUI raster properties "Metadata" tab.
302302
*/
303-
virtual QString metadata() = 0;
303+
virtual QString htmlMetadata() = 0;
304304

305305
/**
306306
* \brief Identify raster value(s) found on the point position. The context

src/providers/arcgisrest/qgsamsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ static inline QString dumpVariantMap( const QVariantMap &variantMap, const QStri
237237
return result;
238238
}
239239

240-
QString QgsAmsProvider::metadata()
240+
QString QgsAmsProvider::htmlMetadata()
241241
{
242242
return dumpVariantMap( mServiceInfo, tr( "Service Info" ) ) + dumpVariantMap( mLayerInfo, tr( "Layer Info" ) );
243243
}

src/providers/arcgisrest/qgsamsprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class QgsAmsProvider : public QgsRasterDataProvider
7979
Qgis::DataType dataType( int /*bandNo*/ ) const override { return Qgis::ARGB32; }
8080
Qgis::DataType sourceDataType( int /*bandNo*/ ) const override { return Qgis::ARGB32; }
8181
QgsRasterInterface *clone() const override;
82-
QString metadata() override;
82+
QString htmlMetadata() override;
8383
bool supportsLegendGraphic() const override { return true; }
8484
QImage getLegendGraphic( double scale = 0, bool forceRefresh = false, const QgsRectangle *visibleExtent = 0 ) override;
8585
QgsImageFetcher *getLegendGraphicFetcher( const QgsMapSettings *mapSettings ) override;

src/providers/gdal/qgsgdalprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ void QgsGdalProvider::closeDataset()
474474
mGdalDataset = nullptr;
475475
}
476476

477-
QString QgsGdalProvider::metadata()
477+
QString QgsGdalProvider::htmlMetadata()
478478
{
479479
QMutexLocker locker( mpMutex );
480480
if ( !initIfNeeded() )

src/providers/gdal/qgsgdalprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase
113113
double bandScale( int bandNo ) const override;
114114
double bandOffset( int bandNo ) const override;
115115
QList<QgsColorRampShader::ColorRampItem> colorTable( int bandNo )const override;
116-
QString metadata() override;
116+
QString htmlMetadata() override;
117117
QStringList subLayers() const override;
118118
static QStringList subLayers( GDALDatasetH dataset );
119119

src/providers/wcs/qgswcsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ QString QgsWcsProvider::coverageMetadata( const QgsWcsCoverageSummary &coverage
12301230
return metadata;
12311231
}
12321232

1233-
QString QgsWcsProvider::metadata()
1233+
QString QgsWcsProvider::htmlMetadata()
12341234
{
12351235
QString metadata;
12361236

src/providers/wcs/qgswcsprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class QgsWcsProvider : public QgsRasterDataProvider, QgsGdalProviderBase
173173
int yBlockSize() const override;
174174
int xSize() const override;
175175
int ySize() const override;
176-
QString metadata() override;
176+
QString htmlMetadata() override;
177177
QgsRasterIdentifyResult identify( const QgsPointXY &point, QgsRaster::IdentifyFormat format, const QgsRectangle &boundingBox = QgsRectangle(), int width = 0, int height = 0, int dpi = 96 ) override;
178178
QString lastErrorTitle() override;
179179
QString lastError() override;

src/providers/wms/qgswmsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,7 @@ QString QgsWmsProvider::layerMetadata( QgsWmsLayerProperty &layer )
18481848
return metadata;
18491849
}
18501850

1851-
QString QgsWmsProvider::metadata()
1851+
QString QgsWmsProvider::htmlMetadata()
18521852
{
18531853
QString metadata;
18541854

src/providers/wms/qgswmsprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ class QgsWmsProvider : public QgsRasterDataProvider
200200
Qgis::DataType dataType( int bandNo ) const override;
201201
Qgis::DataType sourceDataType( int bandNo ) const override;
202202
int bandCount() const override;
203-
QString metadata() override;
203+
QString htmlMetadata() override;
204204
QgsRasterIdentifyResult identify( const QgsPointXY &point, QgsRaster::IdentifyFormat format, const QgsRectangle &boundingBox = QgsRectangle(), int width = 0, int height = 0, int dpi = 96 ) override;
205205
QString lastErrorTitle() override;
206206
QString lastError() override;

tests/src/core/testqgsrasterfilewriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ bool TestQgsRasterFileWriter::writeTest( const QString &rasterName )
115115

116116
std::unique_ptr<QgsRasterLayer> mpRasterLayer( new QgsRasterLayer( myRasterFileInfo.filePath(),
117117
myRasterFileInfo.completeBaseName() ) );
118-
qDebug() << rasterName << " metadata: " << mpRasterLayer->dataProvider()->metadata();
118+
qDebug() << rasterName << " metadata: " << mpRasterLayer->dataProvider()->htmlMetadata();
119119

120120
if ( !mpRasterLayer->isValid() ) return false;
121121

tests/src/core/testqgsrasterlayer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,17 @@ void TestQgsRasterLayer::initTestCase()
148148
QFileInfo myRasterFileInfo( myFileName );
149149
mpRasterLayer = new QgsRasterLayer( myRasterFileInfo.filePath(),
150150
myRasterFileInfo.completeBaseName() );
151-
qDebug() << "tenbyteraster metadata: " << mpRasterLayer->dataProvider()->metadata();
151+
qDebug() << "tenbyteraster metadata: " << mpRasterLayer->dataProvider()->htmlMetadata();
152152

153153
QFileInfo myLandsatRasterFileInfo( myLandsatFileName );
154154
mpLandsatRasterLayer = new QgsRasterLayer( myLandsatRasterFileInfo.filePath(),
155155
myLandsatRasterFileInfo.completeBaseName() );
156-
qDebug() << "landsat metadata: " << mpLandsatRasterLayer->dataProvider()->metadata();
156+
qDebug() << "landsat metadata: " << mpLandsatRasterLayer->dataProvider()->htmlMetadata();
157157

158158
QFileInfo myFloat32RasterFileInfo( myFloat32FileName );
159159
mpFloat32RasterLayer = new QgsRasterLayer( myFloat32RasterFileInfo.filePath(),
160160
myFloat32RasterFileInfo.completeBaseName() );
161-
qDebug() << "float32raster metadata: " << mpFloat32RasterLayer->dataProvider()->metadata();
161+
qDebug() << "float32raster metadata: " << mpFloat32RasterLayer->dataProvider()->htmlMetadata();
162162

163163
QFileInfo pngRasterFileInfo( pngRasterFileName );
164164
mPngRasterLayer = new QgsRasterLayer( pngRasterFileInfo.filePath(),

tests/src/core/testqgsrastersublayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ void TestQgsRasterSubLayer::initTestCase()
9696
QFileInfo myRasterFileInfo( mFileName );
9797
mpRasterLayer = new QgsRasterLayer( myRasterFileInfo.filePath(),
9898
myRasterFileInfo.completeBaseName() );
99-
qDebug() << "raster metadata: " << mpRasterLayer->dataProvider()->metadata();
100-
mReport += "raster metadata: " + mpRasterLayer->dataProvider()->metadata();
99+
qDebug() << "raster metadata: " << mpRasterLayer->dataProvider()->htmlMetadata();
100+
mReport += "raster metadata: " + mpRasterLayer->dataProvider()->htmlMetadata();
101101
}
102102
else
103103
{

0 commit comments

Comments
 (0)