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

Use readXml, writeXml instead of readXML_,writeXML_

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9026 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2008-08-07 22:18:47 +00:00
parent 9a66dd54c2
commit c4437144a9
9 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/core/qgsmaplayer.sip
View File

@ -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 );

4
python/core/qgsrasterlayer.sip
View File

@ -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 );
/*

4
python/core/qgsvectorlayer.sip
View File

@ -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 );
/**

12
src/core/qgsmaplayer.cpp
View File

@ -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

8
src/core/qgsmaplayer.h
View File

@ -128,7 +128,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().
@ -145,7 +145,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().
@ -289,12 +289,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 );

10
src/core/qgsvectorlayer.cpp
View File

@ -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()

4
src/core/qgsvectorlayer.h
View File

@ -160,12 +160,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 );
/**

8
src/core/raster/qgsrasterlayer.cpp
View File

@ -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

4
src/core/raster/qgsrasterlayer.h
View File

@ -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: