Skip to content

Commit c443714

Browse files
author
timlinux
committed
Use readXml, writeXml instead of readXML_,writeXML_
git-svn-id: http://svn.osgeo.org/qgis/trunk@9026 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9a66dd5 commit c443714

9 files changed

+31
-31
lines changed

‎python/core/qgsmaplayer.sip

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public:
114114
The DOM node corresponds to a DOM document project file XML element read
115115
by QgsProject.
116116

117-
This, in turn, calls readXML_(), which is over-rideable by sub-classes so
117+
This, in turn, calls readXml(), which is over-rideable by sub-classes so
118118
that they can read their own specific state from the given DOM node.
119119

120120
Invoked by QgsProject::read().
@@ -131,7 +131,7 @@ public:
131131
The DOM node corresponds to a DOM document project file XML element to be
132132
written by QgsProject.
133133

134-
This, in turn, calls writeXML_(), which is over-rideable by sub-classes so
134+
This, in turn, calls writeXml(), which is over-rideable by sub-classes so
135135
that they can write their own specific state to the given DOM node.
136136

137137
Invoked by QgsProject::write().
@@ -218,12 +218,12 @@ protected:
218218
/** called by readXML(), used by children to read state specific to them from
219219
project files.
220220
*/
221-
virtual bool readXML_( QDomNode & layer_node );
221+
virtual bool readXml( QDomNode & layer_node );
222222

223223
/** called by writeXML(), used by children to write state specific to them to
224224
project files.
225225
*/
226-
virtual bool writeXML_( QDomNode & layer_node, QDomDocument & document );
226+
virtual bool writeXml( QDomNode & layer_node, QDomDocument & document );
227227

228228
/** debugging member - invoked when a connect() is made to this object */
229229
void connectNotify( const char * signal );

‎python/core/qgsrasterlayer.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public slots:
508508
Called by QgsMapLayer::readXML().
509509

510510
*/
511-
/* virtual */ bool readXML_( QDomNode & layer_node );
511+
/* virtual */ bool readXml( QDomNode & layer_node );
512512

513513

514514

@@ -519,7 +519,7 @@ public slots:
519519
Called by QgsMapLayer::writeXML().
520520

521521
*/
522-
/* virtual */ bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
522+
/* virtual */ bool writeXml( QDomNode & layer_node, QDomDocument & doc );
523523

524524

525525
/*

‎python/core/qgsvectorlayer.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ public:
9494
/** reads vector layer specific state from project file DOM node.
9595
* @note Called by QgsMapLayer::readXML().
9696
*/
97-
virtual bool readXML_( QDomNode & layer_node );
97+
virtual bool readXml( QDomNode & layer_node );
9898

9999
/** write vector layer specific state to project file DOM node.
100100
* @note Called by QgsMapLayer::writeXML().
101101
*/
102-
virtual bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
102+
virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc );
103103

104104

105105
/**

‎src/core/qgsmaplayer.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ bool QgsMapLayer::readXML( QDomNode & layer_node )
157157
mSRS->readXML(srsNode);
158158

159159
// now let the children grab what they need from the DOM node.
160-
if (!readXML_( layer_node ))
160+
if (!readXml( layer_node ))
161161
{
162162
return false;
163163
}
@@ -213,12 +213,12 @@ bool QgsMapLayer::readXML( QDomNode & layer_node )
213213
} // void QgsMapLayer::readXML
214214

215215

216-
bool QgsMapLayer::readXML_( QDomNode & layer_node )
216+
bool QgsMapLayer::readXml( QDomNode & layer_node )
217217
{
218218
// NOP by default; children will over-ride with behavior specific to them
219219

220220
return true;
221-
} // void QgsMapLayer::readXML_
221+
} // void QgsMapLayer::readXml
222222

223223

224224

@@ -279,18 +279,18 @@ bool QgsMapLayer::writeXML( QDomNode & layer_node, QDomDocument & document )
279279

280280
layer_node.appendChild( maplayer );
281281

282-
return writeXML_( maplayer, document );
282+
return writeXml( maplayer, document );
283283

284284
} // bool QgsMapLayer::writeXML
285285

286286

287287

288-
bool QgsMapLayer::writeXML_( QDomNode & layer_node, QDomDocument & document )
288+
bool QgsMapLayer::writeXml( QDomNode & layer_node, QDomDocument & document )
289289
{
290290
// NOP by default; children will over-ride with behavior specific to them
291291

292292
return true;
293-
} // void QgsMapLayer::writeXML_
293+
} // void QgsMapLayer::writeXml
294294

295295

296296

‎src/core/qgsmaplayer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
128128
The DOM node corresponds to a DOM document project file XML element read
129129
by QgsProject.
130130
131-
This, in turn, calls readXML_(), which is over-rideable by sub-classes so
131+
This, in turn, calls readXml(), which is over-rideable by sub-classes so
132132
that they can read their own specific state from the given DOM node.
133133
134134
Invoked by QgsProject::read().
@@ -145,7 +145,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
145145
The DOM node corresponds to a DOM document project file XML element to be
146146
written by QgsProject.
147147
148-
This, in turn, calls writeXML_(), which is over-rideable by sub-classes so
148+
This, in turn, calls writeXml(), which is over-rideable by sub-classes so
149149
that they can write their own specific state to the given DOM node.
150150
151151
Invoked by QgsProject::write().
@@ -289,12 +289,12 @@ public slots:
289289
/** called by readXML(), used by children to read state specific to them from
290290
project files.
291291
*/
292-
virtual bool readXML_( QDomNode & layer_node );
292+
virtual bool readXml( QDomNode & layer_node );
293293

294294
/** called by writeXML(), used by children to write state specific to them to
295295
project files.
296296
*/
297-
virtual bool writeXML_( QDomNode & layer_node, QDomDocument & document );
297+
virtual bool writeXml( QDomNode & layer_node, QDomDocument & document );
298298

299299
/** debugging member - invoked when a connect() is made to this object */
300300
void connectNotify( const char * signal );

‎src/core/qgsvectorlayer.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -2027,9 +2027,9 @@ bool QgsVectorLayer::startEditing()
20272027
}
20282028

20292029

2030-
bool QgsVectorLayer::readXML_( QDomNode & layer_node )
2030+
bool QgsVectorLayer::readXml( QDomNode & layer_node )
20312031
{
2032-
QgsDebugMsg(QString("Datasource in QgsVectorLayer::readXML_: ") + mDataSource.toLocal8Bit().data());
2032+
QgsDebugMsg(QString("Datasource in QgsVectorLayer::readXml: ") + mDataSource.toLocal8Bit().data());
20332033

20342034
// process the attribute actions
20352035
mActions->readXML(layer_node);
@@ -2163,7 +2163,7 @@ bool QgsVectorLayer::readXML_( QDomNode & layer_node )
21632163

21642164
return mValid; // should be true if read successfully
21652165

2166-
} // void QgsVectorLayer::readXML_
2166+
} // void QgsVectorLayer::readXml
21672167

21682168

21692169

@@ -2253,7 +2253,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
22532253

22542254

22552255

2256-
/* virtual */ bool QgsVectorLayer::writeXML_( QDomNode & layer_node,
2256+
/* virtual */ bool QgsVectorLayer::writeXml( QDomNode & layer_node,
22572257
QDomDocument & document )
22582258
{
22592259
// first get the layer element so that we can append the type attribute
@@ -2406,7 +2406,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
24062406
}
24072407

24082408
return true;
2409-
} // bool QgsVectorLayer::writeXML_
2409+
} // bool QgsVectorLayer::writeXml
24102410

24112411

24122412
int QgsVectorLayer::findFreeId()

‎src/core/qgsvectorlayer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
160160
/** reads vector layer specific state from project file DOM node.
161161
* @note Called by QgsMapLayer::readXML().
162162
*/
163-
virtual bool readXML_( QDomNode & layer_node );
163+
virtual bool readXml( QDomNode & layer_node );
164164

165165
/** write vector layer specific state to project file DOM node.
166166
* @note Called by QgsMapLayer::writeXML().
167167
*/
168-
virtual bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
168+
virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc );
169169

170170

171171
/**

‎src/core/raster/qgsrasterlayer.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -4031,7 +4031,7 @@ double QgsRasterLayer::readValue ( void *data, GDALDataType type, int index )
40314031
</rasterproperties>
40324032
</maplayer>
40334033
*/
4034-
bool QgsRasterLayer::readXML_( QDomNode & layer_node )
4034+
bool QgsRasterLayer::readXml( QDomNode & layer_node )
40354035
{
40364036
//! @NOTE Make sure to read the file first so stats etc are initialised properly!
40374037

@@ -4281,11 +4281,11 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
42814281

42824282
return true;
42834283

4284-
} // QgsRasterLayer::readXML_( QDomNode & layer_node )
4284+
} // QgsRasterLayer::readXml( QDomNode & layer_node )
42854285

42864286

42874287

4288-
/* virtual */ bool QgsRasterLayer::writeXML_( QDomNode & layer_node,
4288+
/* virtual */ bool QgsRasterLayer::writeXml( QDomNode & layer_node,
42894289
QDomDocument & document )
42904290
{
42914291
// first get the layer element so that we can append the type attribute
@@ -4647,7 +4647,7 @@ bool QgsRasterLayer::readXML_( QDomNode & layer_node )
46474647
}
46484648

46494649
return true;
4650-
} // bool QgsRasterLayer::writeXML_
4650+
} // bool QgsRasterLayer::writeXml
46514651

46524652

46534653

‎src/core/raster/qgsrasterlayer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ public slots:
884884
Called by QgsMapLayer::readXML().
885885
886886
*/
887-
/* virtual */ bool readXML_( QDomNode & layer_node );
887+
/* virtual */ bool readXml( QDomNode & layer_node );
888888

889889

890890

@@ -895,7 +895,7 @@ public slots:
895895
Called by QgsMapLayer::writeXML().
896896
897897
*/
898-
/* virtual */ bool writeXML_( QDomNode & layer_node, QDomDocument & doc );
898+
/* virtual */ bool writeXml( QDomNode & layer_node, QDomDocument & doc );
899899

900900
private:
901901

0 commit comments

Comments
 (0)