API cleanup for raster data provider

git-svn-id: http://svn.osgeo.org/qgis/trunk@9539 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 24, 2008 · 6eb5e8c · 6eb5e8c
1 parent bb9c89a
commit 6eb5e8c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/python/core/qgsrasterdataprovider.sip b/python/core/qgsrasterdataprovider.sip
@@ -81,7 +81,7 @@ public:
      * Get metadata in a format suitable for feeding directly
      * into a subset of the GUI raster properties "Metadata" tab.
      */
-    virtual QString getMetadata() = 0;
+    virtual QString metadata() = 0;
 
     /**
      * \brief Identify details from a server (e.g. WMS) from the last screen update

diff --git a/python/core/qgsrasterlayer.sip b/python/core/qgsrasterlayer.sip
@@ -381,7 +381,7 @@ public:
     /** \brief Emit a signal asking for a repaint. (inherited from maplayer) */
     void triggerRepaint();
     /** \brief Obtain GDAL Metadata for this layer */
-    QString getMetadata(); 
+    QString metadata(); 
     /** \brief Accessor for ths raster layers pyramid list. A pyramid list defines the 
      * POTENTIAL pyramids that can be in a raster. To know which of the pyramid layers 
      * ACTUALLY exists you need to look at the existsFlag member in each struct stored in the 

diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -833,7 +833,7 @@ void QgsRasterLayerProperties::sync()
   //populate the metadata tab's text browser widget with gdal metadata info
   QString myStyle = QgsApplication::reportStyleSheet();
   txtbMetadata->document()->setDefaultStyleSheet( myStyle );
-  txtbMetadata->setHtml( mRasterLayer->getMetadata() );
+  txtbMetadata->setHtml( mRasterLayer->metadata() );
 
 } // QgsRasterLayerProperties::sync()
 
@@ -1629,7 +1629,7 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()
   pixmapLegend->repaint();
   //populate the metadata tab's text browser widget with gdal metadata info
   QString myStyle = QgsApplication::reportStyleSheet();
-  txtbMetadata->setHtml( mRasterLayer->getMetadata() );
+  txtbMetadata->setHtml( mRasterLayer->metadata() );
   txtbMetadata->document()->setDefaultStyleSheet( myStyle );
 }
 

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -441,7 +441,7 @@ void QgsVectorLayerProperties::reset( void )
   QString myStyle = QgsApplication::reportStyleSheet();
   teMetadata->clear();
   teMetadata->document()->setDefaultStyleSheet( myStyle );
-  teMetadata->setHtml( getMetadata() );
+  teMetadata->setHtml( metadata() );
   actionDialog->init();
   labelDialog->init();
   labelCheckBox->setChecked( layer->hasLabelsEnabled() );
@@ -478,7 +478,7 @@ void QgsVectorLayerProperties::apply()
     QString myStyle = QgsApplication::reportStyleSheet();
     teMetadata->clear();
     teMetadata->document()->setDefaultStyleSheet( myStyle );
-    teMetadata->setHtml( getMetadata() );
+    teMetadata->setHtml( metadata() );
     // update the extents of the layer (fetched from the provider)
     layer->updateExtents();
   }
@@ -655,7 +655,7 @@ void QgsVectorLayerProperties::on_pbnIndex_clicked()
   }
 }
 
-QString QgsVectorLayerProperties::getMetadata()
+QString QgsVectorLayerProperties::metadata()
 {
   QString myMetadata = "<html><body>";
   myMetadata += "<table width=\"100%\">";

diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -66,7 +66,7 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
     void reset();
 
     /** Get metadata about the layer in nice formatted html */
-    QString getMetadata();
+    QString metadata();
 
     /** Set transparency based on slider position */
     void sliderTransparency_valueChanged( int theValue );

diff --git a/src/core/qgsrasterdataprovider.h b/src/core/qgsrasterdataprovider.h
@@ -113,7 +113,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider
      * Get metadata in a format suitable for feeding directly
      * into a subset of the GUI raster properties "Metadata" tab.
      */
-    virtual QString getMetadata() = 0;
+    virtual QString metadata() = 0;
 
     /**
      * \brief Identify details from a server (e.g. WMS) from the last screen update

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -441,7 +441,7 @@ bool QgsRasterLayer::readFile( QString const & fileName )
 
   // Get the layer's projection info and set up the
   // QgsCoordinateTransform for this layer
-  // NOTE: we must do this before getMetadata is called
+  // NOTE: we must do this before metadata is called
 
   QString mySourceWkt = getProjectionWkt();
 
@@ -462,7 +462,7 @@ bool QgsRasterLayer::readFile( QString const & fileName )
   //that they match the coordinate system of this layer
   QgsDebugMsg( "Layer registry has " + QString::number( QgsMapLayerRegistry::instance()->count() ) + "layers" );
 
-  getMetadata();
+  metadata();
 
   // Use the affine transform to get geo coordinates for
   // the corners of the raster
@@ -3010,7 +3010,7 @@ void QgsRasterLayer::updateProgress( int theProgress, int theMax )
 
 
 
-// convenience function for building getMetadata() HTML table cells
+// convenience function for building metadata() HTML table cells
 static
 QString
 makeTableCell_( QString const & value )
@@ -3020,7 +3020,7 @@ makeTableCell_( QString const & value )
 
 
 
-// convenience function for building getMetadata() HTML table cells
+// convenience function for building metadata() HTML table cells
 static
 QString
 makeTableCells_( QStringList const & values )
@@ -3061,7 +3061,7 @@ cStringList2Q_( char ** stringList )
 
 
 
-QString QgsRasterLayer::getMetadata()
+QString QgsRasterLayer::metadata()
 {
   QString myMetadata ;
   myMetadata += "<p class=\"glossy\">" + tr( "Driver:" ) + "</p>\n";
@@ -3081,7 +3081,7 @@ QString QgsRasterLayer::getMetadata()
   if ( !mProviderKey.isEmpty() )
   {
     // Insert provider-specific (e.g. WMS-specific) metadata
-    myMetadata += mDataProvider->getMetadata();
+    myMetadata += mDataProvider->metadata();
   }
   else
   {

diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -710,7 +710,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     /** \brief Emit a signal asking for a repaint. (inherited from maplayer) */
     void triggerRepaint();
     /** \brief Obtain GDAL Metadata for this layer */
-    QString getMetadata();
+    QString metadata();
     /** \brief Accessor for ths raster layers pyramid list. A pyramid list defines the
      * POTENTIAL pyramids that can be in a raster. To know which of the pyramid layers
      * ACTUALLY exists you need to look at the existsFlag member in each struct stored in the

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -1823,7 +1823,7 @@ int QgsWmsProvider::capabilities() const
 }
 
 
-QString QgsWmsProvider::getMetadata()
+QString QgsWmsProvider::metadata()
 {
 
   QString myMetadataQString = "";

diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
@@ -496,7 +496,7 @@ class QgsWmsProvider : public QgsRasterDataProvider
      * Get metadata in a format suitable for feeding directly
      * into a subset of the GUI raster properties "Metadata" tab.
      */
-    QString getMetadata();
+    QString metadata();
 
 
     /**