Use readXml, writeXml instead of readXML_,writeXML_

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9026 c8812cc2-4d05-0410-92ff-de0c093fc19c

python/core/qgsmaplayer.sip

@@ -114,7 +114,7 @@ public:
        The DOM node corresponds to a DOM document project file XML element read
        by QgsProject.
 
-       This, in turn, calls readXML_(), which is over-rideable by sub-classes so
+       This, in turn, calls readXml(), which is over-rideable by sub-classes so
        that they can read their own specific state from the given DOM node.
 
        Invoked by QgsProject::read().
@@ -131,7 +131,7 @@ public:
        The DOM node corresponds to a DOM document project file XML element to be
        written by QgsProject.
 
-       This, in turn, calls writeXML_(), which is over-rideable by sub-classes so
+       This, in turn, calls writeXml(), which is over-rideable by sub-classes so
        that they can write their own specific state to the given DOM node.
 
        Invoked by QgsProject::write().
@@ -218,12 +218,12 @@ protected:
     /** called by readXML(), used by children to read state specific to them from
         project files.
     */
-    virtual bool readXML_( QDomNode & layer_node );
+    virtual bool readXml( QDomNode & layer_node );
 
     /** called by writeXML(), used by children to write state specific to them to
         project files.
     */
-    virtual bool writeXML_( QDomNode & layer_node, QDomDocument & document );
+    virtual bool writeXml( QDomNode & layer_node, QDomDocument & document );
 
     /** debugging member - invoked when a connect() is made to this object */
     void connectNotify( const char * signal );

python/core/qgsrasterlayer.sip

@@ -508,7 +508,7 @@ public slots:
         Called by QgsMapLayer::readXML().
 
     */
-    /* virtual */ bool readXML_( QDomNode & layer_node );
+    /* virtual */ bool readXml( QDomNode & layer_node );
 
 
 
@@ -519,7 +519,7 @@ public slots:
       Called by QgsMapLayer::writeXML().
 
   */
-  /* virtual */ bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
+  /* virtual */ bool writeXml( QDomNode & layer_node, QDomDocument & doc );
 
 
 /*

python/core/qgsvectorlayer.sip

@@ -94,12 +94,12 @@ public:
   /** reads vector layer specific state from project file DOM node.
    *  @note Called by QgsMapLayer::readXML().
    */
-  virtual bool readXML_( QDomNode & layer_node );
+  virtual bool readXml( QDomNode & layer_node );
 
   /** write vector layer specific state to project file DOM node.
    *  @note Called by QgsMapLayer::writeXML().
    */
-  virtual bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
+  virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc );
 
 
   /**

src/core/qgsmaplayer.cpp

@@ -157,7 +157,7 @@ bool QgsMapLayer::readXML( QDomNode & layer_node )
   mSRS->readXML(srsNode);
 
   // now let the children grab what they need from the DOM node.
-  if (!readXML_( layer_node ))
+  if (!readXml( layer_node ))
   {
     return false;
   }
@@ -213,12 +213,12 @@ bool QgsMapLayer::readXML( QDomNode & layer_node )
 } // void QgsMapLayer::readXML
 
 
-bool QgsMapLayer::readXML_( QDomNode & layer_node )
+bool QgsMapLayer::readXml( QDomNode & layer_node )
 {
   // NOP by default; children will over-ride with behavior specific to them
 
   return true;
-} // void QgsMapLayer::readXML_
+} // void QgsMapLayer::readXml
 
 
 
@@ -279,18 +279,18 @@ bool QgsMapLayer::writeXML( QDomNode & layer_node, QDomDocument & document )
 
   layer_node.appendChild( maplayer );
 
-  return writeXML_( maplayer, document );
+  return writeXml( maplayer, document );
 
 } // bool QgsMapLayer::writeXML
 
 
 
-bool QgsMapLayer::writeXML_( QDomNode & layer_node, QDomDocument & document )
+bool QgsMapLayer::writeXml( QDomNode & layer_node, QDomDocument & document )
 {
   // NOP by default; children will over-ride with behavior specific to them
 
   return true;
-} // void QgsMapLayer::writeXML_
+} // void QgsMapLayer::writeXml
 
 
 

src/core/qgsmaplayer.h

@@ -128,7 +128,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
        The DOM node corresponds to a DOM document project file XML element read
        by QgsProject.
 
-       This, in turn, calls readXML_(), which is over-rideable by sub-classes so
+       This, in turn, calls readXml(), which is over-rideable by sub-classes so
        that they can read their own specific state from the given DOM node.
 
        Invoked by QgsProject::read().
@@ -145,7 +145,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
        The DOM node corresponds to a DOM document project file XML element to be
        written by QgsProject.
 
-       This, in turn, calls writeXML_(), which is over-rideable by sub-classes so
+       This, in turn, calls writeXml(), which is over-rideable by sub-classes so
        that they can write their own specific state to the given DOM node.
 
        Invoked by QgsProject::write().
@@ -289,12 +289,12 @@ public slots:
     /** called by readXML(), used by children to read state specific to them from
         project files.
     */
-    virtual bool readXML_( QDomNode & layer_node );
+    virtual bool readXml( QDomNode & layer_node );
 
     /** called by writeXML(), used by children to write state specific to them to
         project files.
     */
-    virtual bool writeXML_( QDomNode & layer_node, QDomDocument & document );
+    virtual bool writeXml( QDomNode & layer_node, QDomDocument & document );
 
     /** debugging member - invoked when a connect() is made to this object */
     void connectNotify( const char * signal );

src/core/qgsvectorlayer.cpp

@@ -2027,9 +2027,9 @@ bool QgsVectorLayer::startEditing()
 }
 
 
-bool QgsVectorLayer::readXML_( QDomNode & layer_node )
+bool QgsVectorLayer::readXml( QDomNode & layer_node )
 {
-  QgsDebugMsg(QString("Datasource in QgsVectorLayer::readXML_: ") + mDataSource.toLocal8Bit().data());
+  QgsDebugMsg(QString("Datasource in QgsVectorLayer::readXml: ") + mDataSource.toLocal8Bit().data());
 
   // process the attribute actions
   mActions->readXML(layer_node);
@@ -2163,7 +2163,7 @@ bool QgsVectorLayer::readXML_( QDomNode & layer_node )
 
   return mValid;               // should be true if read successfully
 
-} // void QgsVectorLayer::readXML_
+} // void QgsVectorLayer::readXml
 
 
 
@@ -2253,7 +2253,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
 
 
 
-/* virtual */ bool QgsVectorLayer::writeXML_( QDomNode & layer_node,
+/* virtual */ bool QgsVectorLayer::writeXml( QDomNode & layer_node,
     QDomDocument & document )
 {
   // first get the layer element so that we can append the type attribute
@@ -2406,7 +2406,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
   }
 
   return true;
-} // bool QgsVectorLayer::writeXML_
+} // bool QgsVectorLayer::writeXml
 
 
 int QgsVectorLayer::findFreeId()

src/core/qgsvectorlayer.h

@@ -160,12 +160,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
   /** reads vector layer specific state from project file DOM node.
    *  @note Called by QgsMapLayer::readXML().
    */
-  virtual bool readXML_( QDomNode & layer_node );
+  virtual bool readXml( QDomNode & layer_node );
 
   /** write vector layer specific state to project file DOM node.
    *  @note Called by QgsMapLayer::writeXML().
    */
-  virtual bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
+  virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc );
 
 
   /**

src/core/raster/qgsrasterlayer.cpp

@@ -4031,7 +4031,7 @@ double QgsRasterLayer::readValue ( void *data, GDALDataType type, int index )
   </rasterproperties>
   </maplayer>
   */
-bool QgsRasterLayer::readXML_( QDomNode & layer_node )
+bool QgsRasterLayer::readXml( QDomNode & layer_node )
 {
   //! @NOTE Make sure to read the file first so stats etc are initialised properly!
 
@@ -4281,11 +4281,11 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
 
   return true;
 
-} // QgsRasterLayer::readXML_( QDomNode & layer_node )
+} // QgsRasterLayer::readXml( QDomNode & layer_node )
 
 
 
-/* virtual */ bool QgsRasterLayer::writeXML_( QDomNode & layer_node,
+/* virtual */ bool QgsRasterLayer::writeXml( QDomNode & layer_node,
     QDomDocument & document )
 {
   // first get the layer element so that we can append the type attribute
@@ -4647,7 +4647,7 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
   }
 
   return true;
-} // bool QgsRasterLayer::writeXML_
+} // bool QgsRasterLayer::writeXml
 
 
 

src/core/raster/qgsrasterlayer.h

@@ -884,7 +884,7 @@ public slots:
         Called by QgsMapLayer::readXML().
 
     */
-    /* virtual */ bool readXML_( QDomNode & layer_node );
+    /* virtual */ bool readXml( QDomNode & layer_node );
 
 
 
@@ -895,7 +895,7 @@ public slots:
       Called by QgsMapLayer::writeXML().
 
   */
-  /* virtual */ bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
+  /* virtual */ bool writeXml( QDomNode & layer_node, QDomDocument & doc );
 
 private: