Skip to content

Commit

Permalink
Use readXml, writeXml instead of readXML_,writeXML_
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk@9026 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Aug 7, 2008
1 parent 9a66dd5 commit c443714
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 31 deletions.
8 changes: 4 additions & 4 deletions python/core/qgsmaplayer.sip
View file
Expand Up @@ -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().
Expand All @@ -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().
Expand Down Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions python/core/qgsrasterlayer.sip
View file
Expand Up @@ -508,7 +508,7 @@ public slots:
Called by QgsMapLayer::readXML().

*/
/* virtual */ bool readXML_( QDomNode & layer_node );
/* virtual */ bool readXml( QDomNode & layer_node );



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


/*
Expand Down
4 changes: 2 additions & 2 deletions python/core/qgsvectorlayer.sip
View file
Expand Up @@ -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 );


/**
Expand Down
12 changes: 6 additions & 6 deletions src/core/qgsmaplayer.cpp
View file
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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



Expand Down Expand Up @@ -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



Expand Down
8 changes: 4 additions & 4 deletions src/core/qgsmaplayer.h
View file
Expand Up @@ -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().
Expand All @@ -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().
Expand Down Expand Up @@ -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 );
Expand Down
10 changes: 5 additions & 5 deletions src/core/qgsvectorlayer.cpp
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -2163,7 +2163,7 @@ bool QgsVectorLayer::readXML_( QDomNode & layer_node )

return mValid; // should be true if read successfully

} // void QgsVectorLayer::readXML_
} // void QgsVectorLayer::readXml



Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -2406,7 +2406,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
}

return true;
} // bool QgsVectorLayer::writeXML_
} // bool QgsVectorLayer::writeXml


int QgsVectorLayer::findFreeId()
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsvectorlayer.h
View file
Expand Up @@ -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 );


/**
Expand Down
8 changes: 4 additions & 4 deletions src/core/raster/qgsrasterlayer.cpp
View file
Expand Up @@ -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!

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -4647,7 +4647,7 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
}

return true;
} // bool QgsRasterLayer::writeXML_
} // bool QgsRasterLayer::writeXml



Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasterlayer.h
View file
Expand Up @@ -884,7 +884,7 @@ public slots:
Called by QgsMapLayer::readXML().
*/
/* virtual */ bool readXML_( QDomNode & layer_node );
/* virtual */ bool readXml( QDomNode & layer_node );



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

Expand Down

0 comments on commit c443714

Please sign in to comment.