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

Make API more consistent

Browse Source 
- rename methods with XML to Xml, CRS to Crs, WMS to Wms, ID to Id
- rename methods with SRS to Crs
- rename methods with abbreviations like "dest" to "destination"
- rename methods with abbreviations like "src" to "source"
This commit is contained in:
Nyall Dawson 2016-07-19 11:45:47 +10:00
parent 44c8680b00
commit 4cfacf14e3
413 changed files with 2106 additions and 1911 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
doc/api_break.dox
View File

@ -24,6 +24,76 @@ This page tries to maintain a list with incompatible changes that happened in pr
<li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
</ul>
\subsection qgis_api_break_3_0_global General changes
<ul>
<li>All setDestinationCRS() methods have been renamed to setDestinationCrs()</li>
<li>All destinationCRS() methods have been renamed to destinationCrs()</li>
<li>All readXML() and _readXML() methods have been renamed to readXml() and _readXml()</li>
<li>All writeXML() and _writeXML() methods have been renamed to writeXml() and _writeXml()</li>
<li>All setLayerID() methods have been renamed to setLayerId()</li>
<li>All layerID() methods have been renamed to layerId()</li>
<li>All setCRS() methods have been renamed to setCrs()</li>
<li>All srcCrs() methods have been renamed to sourceCrs()</li>
<li>All destCrs() methods have been renamed to destinationCrs()</li>
<li>All exportXML() methods have been renamed to exportXml()</li>
<li>All importXML() methods have been renamed to importXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsAuthConfigUriEdit QgsAuthConfigUriEdit
<ul>
<li>hasConfigID() has been renamed to hasConfigId()</li>
</ul>
\subsection qgis_api_break_3_0_QgsAtlasComposition QgsAtlasComposition
<ul>
<li>readXMLMapSettings() has been renamed to readXmlMapSettings()</li>
</ul>
\subsection qgis_api_break_3_0_QgsComposerLegendItem QgsComposerLegendItem
<ul>
<li>writeXMLChildren() has been renamed to writeXmlChildren()</li>
</ul>
\subsection qgis_api_break_3_0_QgsComposerMap QgsComposerMap
<ul>
<li>containsWMSLayer() has been renamed to containsWmsLayer()</li>
</ul>
\subsection qgis_api_break_3_0_QgsComposerNodesItem QgsComposerNodesItem
<ul>
<li>_readXMLStyle() has been renamed to _readXmlStyle()</li>
<li>_writeXMLStyle() has been renamed to _writeXMLStyle()</li>
</ul>
\subsection qgis_api_break_3_0_QgsComposerTable QgsComposerTable
<ul>
<li>tableWriteXML() has been renamed to tableWriteXml()</li>
<li>tableReadXML() has been renamed to tableReadXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsComposition QgsComposition
<ul>
<li>addItemsFromXML() has been renamed to addItemsFromXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsCoordinateReferenceSystem QgsCoordinateReferenceSystem
<ul>
<li>setCustomSrsValidation() has been renamed to setCustomCrsValidation()</li>
<li>saveAsUserCRS() has been renamed to saveAsUserCrs()</li>
<li>geographicCRSAuthId() has been renamed to geographicCrsAuthId()</li>
</ul>
\subsection qgis_api_break_3_0_QgsCoordinateTransform QgsCoordinateTransform
<ul>
@ -50,6 +120,19 @@ plugins calling these methods will need to be updated.</li>
be returned in place of a null pointer.</li>
</ul>
\subsection qgis_api_break_3_0_QgsCptCitySelectionItem QgsCptCitySelectionItem
<ul>
<li>parseXML() has been renamed to parseXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsCRSCache QgsCRSCache
<ul>
<li>QgsCRSCache has been renamed to QgsCrsCache</li>
<li>updateCRSCache() has been renamed to updateCrsCache</li>
</ul>
\subsection qgis_api_break_3_0_QgsDataDefinedSymbolDialog QgsDataDefinedSymbolDialog
<ul>
@ -57,6 +140,12 @@ be returned in place of a null pointer.</li>
instead.</li>
</ul>
\subsection qgis_api_break_3_0_QgsDataItem QgsDataItem
<ul>
<li>supportedCRS() has been renamed to supportedCrs()</li>
</ul>
\subsection qgis_api_break_3_0_QgsDiagramLayerSettings QgsDiagramLayerSettings
<ul>
@ -89,6 +178,12 @@ attributeIndexes(), pkAttributeIndexes(), isSaveAndLoadStyleToDBSupported()</li>
</li>
</ul>
\subsection qgis_api_break_3_0_QgsGroupWMSDataDialog QgsGroupWMSDataDialog
<ul>
<li>QgsGroupWMSDataDialo has been renamed to QgsGroupWmsDataDialog</li>
</ul>
\subsection qgis_api_break_3_0_DataProviders Data Providers
<ul>
@ -97,6 +192,19 @@ objects are implicitly shared, returning a copy helps simplify and make code mor
only affects third party c++ providers, and does not affect PyQGIS scripts.</li>
</ul>
\subsection qgis_api_break_3_0_QgsLayerTreeGroup QgsLayerTreeGroup
<ul>
<li>readChildrenFromXML() has been renamed to readChildrenFromXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsLayerTreeNode QgsLayerTreeNode
<ul>
<li>readCommonXML() has been renamed to readCommonXml()</li>
<li>writeCommonXML() has been renamed to writeCommonXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsMapCanvas QgsMapCanvas
<ul>
@ -121,6 +229,14 @@ screenUpdateRequested() were removed. These members have had no effect for a num
<li>The layerCrsChanged() signal was renamed to crsChanged()</li>
<li>theError parameter in appendError() and setError() were renamed to 'error'.</li>
<li>drawLabels() method was removed. It used old deprecated labeling. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
<li>readLayerXML() was renamed to readLayerXml()</li>
<li>writeLayerXML() was renamed to writeLayerXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsMapOverviewCanvas QgsMapOverviewCanvas
<ul>
<li>destinationSrsChanged() was renamed to destinationCrsChanged()</li>
</ul>
\subsection qgis_api_break_3_0_QgsMapRenderer QgsMapRenderer
@ -128,6 +244,7 @@ screenUpdateRequested() were removed. These members have had no effect for a num
<ul>
<li>transformation() now returns a QgsCoordinateTransform object, not a pointer. An invalid QgsCoordinateTransform will
be returned instead of a null pointer if no transformation is required.</li>
<li>destinationSrsChanged() was renamed to destinationCrsChanged()</li>
</ul>
\subsection qgis_api_break_3_0_QgsMapRendererJob QgsMapRendererJob
@ -146,6 +263,52 @@ be used instead of a null pointer if no transformation is required.</li>
be returned instead of a null pointer if no transformation is required.</li>
</ul>
\subsection qgis_api_break_3_0_QgsOSMElement QgsOSMElement
<ul>
<li>elemID() has been renamed to elemId()</li>
</ul>
\subsection qgis_api_break_3_0_QgsOWSSourceSelect QgsOWSSourceSelect
<ul>
<li>selectedLayersCRSs() has been renamed selectedLayersCrses()</li>
<li>populateCRS() has been renamed to populateCrs()</li>
<li>clearCRS() has been renamed to clearCrs()</li>
<li>addWMSListRow() has been renamed to addWmsListRow()</li>
<li>addWMSListItem() has been renamed to addWmsListItem()</li>
<li>selectedCRS() has been renamed to selectedCrs()</li>
</ul>
\subsection qgis_api_break_3_0_QgsOWSConnection QgsOWSConnection
<ul>
<li>QgsOWSConnection has been renamed QgsOwsConnection</li>
</ul>
\subsection qgis_api_break_3_0_QgsRasterDataProvider QgsRasterDataProvider
<ul>
<li>srcDataType() has been renamed to sourceDataType()</li>
<li>srcHasNoDataValue() has been renamed to sourceHasNoDataValue()</li>
<li>useSrcNoDataValue() has been renamed to useSourceNoDataValue()</li>
<li>setUseSrcNoDataValue() has been renamed to setUseSourceNoDataValue()</li>
<li>srcNoDataValue() has been renamed to sourceNoDataValue()</li>
</ul>
\subsection qgis_api_break_3_0_QgsRasterInterface QgsRasterInterface
<ul>
<li>srcDataType() has been renamed to sourceDataType()</li>
<li>srcInput() has been renamed to sourceInput()</li>
</ul>
\subsection qgis_api_break_3_0_QgsRelation QgsRelation
<ul>
<li>createFromXML() has been renamed to createFromXml()</li>
</ul>
\subsection qgis_api_break_3_0_QgsRenderContext QgsRenderContext
<ul>
@ -169,6 +332,15 @@ be used instead of a null pointer if no transformation is required.</li>
plugins calling this method will need to be updated.</li>
</ul>
\subsection qgis_api_break_3_0_QgsVectorLayer QgsVectorLayer
<ul>
<li>excludeAttributesWMS() and setExcludeAttributesWMS() have been renamed to excludeAttributesWms() and
setExcludeAttributesWms()</li>
<li>excludeAttributesWFS() and setExcludeAttributesWFS() have been renamed to excludeAttributesWfs() and
setExcludeAttributesWfs()</li>
</ul>
\subsection qgis_api_break_3_0_QgsVectorLayerImport QgsVectorLayerImport
<ul>
@ -183,7 +355,9 @@ in code which previously passed a null pointer to QgsVectorLayerImport.</li>
<ul>
<li>The constructor now takes a reference rather than a pointer to a CRS. This has no effect on PyQGIS code, but c++
plugins calling this method will need to be updated.</li>
<li>destCrs() now returns a copy instead of a reference to the CRS. This has no effect on PyQGIS code, but c++
<li>The destCRS parameter in the constructor has been renamed to destinationCrs.</li>
<li>destCRS() has been renamed to destinationCrs()</li>
<li>destinationCrs() now returns a copy instead of a reference to the CRS. This has no effect on PyQGIS code, but c++
plugins calling this method will need to be updated.</li>
</ul>
@ -248,6 +422,11 @@ and deletedFeatureIds() functions now return values, not references. This has no
plugins calling these methods will need to be updated.</li>
</ul>
\subsection qgis_api_break_3_0_QgsWMSLegendNode QgsWMSLegendNode
<ul>
<li>QgsWMSLegendNode has been renamed to QgsWmsLegendNode</li>
</ul>
\section qgis_api_break_2_4 QGIS 2.4

2
python/analysis/openstreetmap/qgsosmbase.sip
View File

@ -32,7 +32,7 @@ class QgsOSMElement
bool isValid() const;
// fetched automatically from DB
QgsOSMElementID elemID() const;
QgsOSMElementID elemId() const;
qint64 id() const;
//QString username() const;
//QDateTime timestamp() const;

4
python/analysis/raster/qgsalignraster.sip
View File

@ -118,9 +118,9 @@ class QgsAlignRaster
QSizeF cellSize() const;
//! Set the output CRS in WKT format
void setDestinationCRS( const QString& crsWkt );
void setDestinationCrs( const QString& crsWkt );
//! Get the output CRS in WKT format
QString destinationCRS() const;
QString destinationCrs() const;
//! Configure clipping extent (region of interest).
//! No extra clipping is done if the rectangle is null

6
python/core/composer/qgsatlascomposition.sip
View File

@ -179,7 +179,7 @@ public:
/** Returns the current filename. Must be called after prepareForFeature() */
QString currentFilename() const;
void writeXML( QDomElement& elem, QDomDocument& doc ) const;
void writeXml( QDomElement& elem, QDomDocument& doc ) const;
/** Reads general atlas settings from xml
* @param elem a QDomElement holding the atlas properties.
@ -187,7 +187,7 @@ public:
* @see readXMLMapSettings
* @note This method should be called before restoring composer item properties
*/
void readXML( const QDomElement& elem, const QDomDocument& doc );
void readXml( const QDomElement& elem, const QDomDocument& doc );
/** Reads old (pre 2.2) map related atlas settings from xml
* @param elem a QDomElement holding the atlas map properties.
@ -196,7 +196,7 @@ public:
* @note This method should be called after restoring composer item properties
* @note added in version 2.5
*/
void readXMLMapSettings( const QDomElement& elem, const QDomDocument& doc );
void readXmlMapSettings( const QDomElement& elem, const QDomDocument& doc );
QgsComposition* composition();

4
python/core/composer/qgscomposerarrow.sip
View File

@ -174,11 +174,11 @@ class QgsComposerArrow: QgsComposerItem
* @param elem is DOM element corresponding to 'Composer' tag
* @param doc document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from DOM document
* @param itemElem is DOM node corresponding to item tag
* @param doc is the document to read
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
};

4
python/core/composer/qgscomposerattributetable.sip
View File

@ -48,14 +48,14 @@ class QgsComposerAttributeTable : QgsComposerTable
* @param doc QDomDocument for the destination xml.
* @see readXML
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Reads the properties specific to an attribute table from xml.
* @param itemElem a QDomElement holding the attribute table's desired properties.
* @param doc QDomDocument for the source xml.
* @see writeXML
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Sets the vector layer from which to display feature attributes
* @param layer Vector layer for attribute table

4
python/core/composer/qgscomposerattributetablev2.sip
View File

@ -52,7 +52,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @param ignoreFrames ignore frames
* @see readXML
*/
virtual bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
virtual bool writeXml( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
/** Reads the properties specific to an attribute table from xml.
* @param itemElem a QDomElement holding the attribute table's desired properties.
@ -60,7 +60,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @param ignoreFrames ignore frames
* @see writeXML
*/
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
virtual bool readXml( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
virtual void addFrame( QgsComposerFrame* frame /Transfer/, bool recalcFrameSizes = true );

4
python/core/composer/qgscomposerframe.sip
View File

@ -31,8 +31,8 @@ class QgsComposerFrame: QgsComposerItem
void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget );
void beginItemCommand( const QString& text );
void endItemCommand();
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
int type() const;
/** Returns the visible portion of the multi frame's content which

4
python/core/composer/qgscomposerhtml.sip
View File

@ -174,8 +174,8 @@ class QgsComposerHtml: QgsComposerMultiFrame
virtual QString displayName() const;
QSizeF totalSize() const;
void render( QPainter* p, const QRectF& renderExtent, const int frameIndex );
bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
bool writeXml( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
bool readXml( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
void addFrame( QgsComposerFrame* frame /Transfer/, bool recalcFrameSizes = true );
//overridden to break frames without dividing lines of text
double findNearbyPageBreak( double yPos );

4
python/core/composer/qgscomposeritem.sip
View File

@ -282,10 +282,10 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
virtual void setSceneRect( const QRectF& rectangle );
/** Writes parameter that are not subclass specific in document. Usually called from writeXML methods of subclasses*/
bool _writeXML( QDomElement& itemElem, QDomDocument& doc ) const;
bool _writeXml( QDomElement& itemElem, QDomDocument& doc ) const;
/** Reads parameter that are not subclass specific in document. Usually called from readXML methods of subclasses*/
bool _readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool _readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Whether this item has a frame or not.
* @returns true if there is a frame around this item, otherwise false.

4
python/core/composer/qgscomposeritemgroup.sip
View File

@ -28,13 +28,13 @@ class QgsComposerItemGroup: QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc is the Dom document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom node corresponding to item tag
* @param doc is the Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
QSet<QgsComposerItem*> items();

4
python/core/composer/qgscomposerlabel.sip
View File

@ -116,13 +116,13 @@ class QgsComposerLabel : QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom element corresponding to 'ComposerLabel' tag
* @param doc document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
//Overridden to contain part of label's text
virtual QString displayName() const;

4
python/core/composer/qgscomposerlegend.sip
View File

@ -222,13 +222,13 @@ class QgsComposerLegend : QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc Dom document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom node corresponding to item tag
* @param doc is Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
//Overridden to show legend title
virtual QString displayName() const;

30
python/core/composer/qgscomposerlegenditem.sip
View File

@ -19,11 +19,11 @@ class QgsComposerLegendItem : QStandardItem
StyleItem
};
virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const = 0;
virtual void writeXml( QDomElement& elem, QDomDocument& doc ) const = 0;
/** Read item content from xml
@param itemElem item to read from
@param xServerAvailable Read item icons if true (QIcon needs x-server)*/
virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true ) = 0;
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true ) = 0;
virtual ItemType itemType() const = 0;
virtual QStandardItem* clone() const = 0;
@ -37,7 +37,7 @@ class QgsComposerLegendItem : QStandardItem
virtual void setUserText( const QString & text );
protected:
void writeXMLChildren( QDomElement& elem, QDomDocument& doc ) const;
void writeXmlChildren( QDomElement& elem, QDomDocument& doc ) const;
};
@ -55,8 +55,8 @@ class QgsComposerSymbolV2Item: QgsComposerLegendItem
virtual QStandardItem* clone() const /Factory/;
virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );
virtual void writeXml( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true );
/** Set symbol (takes ownership)*/
void setSymbolV2( QgsSymbolV2* s /Transfer/ );
@ -78,12 +78,12 @@ class QgsComposerRasterSymbolItem : QgsComposerLegendItem
virtual QStandardItem* clone() const /Factory/;
virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );
virtual void writeXml( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true );
ItemType itemType() const;
void setLayerID( const QString& id );
QString layerID() const;
void setLayerId( const QString& id );
QString layerId() const;
void setColor( const QColor& c );
QColor color() const;
@ -101,13 +101,13 @@ class QgsComposerLayerItem : QgsComposerLegendItem
virtual ~QgsComposerLayerItem();
virtual QStandardItem* clone() const /Factory/;
virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );
virtual void writeXml( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true );
ItemType itemType() const;
void setLayerID( const QString& id );
QString layerID() const;
void setLayerId( const QString& id );
QString layerId() const;
void setShowFeatureCount( bool show );
bool showFeatureCount() const;
@ -127,8 +127,8 @@ class QgsComposerGroupItem : QgsComposerLegendItem
virtual ~QgsComposerGroupItem();
virtual QStandardItem* clone() const /Factory/;
virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );
virtual void writeXml( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true );
ItemType itemType() const;
};

4
python/core/composer/qgscomposerlegendstyle.sip
View File

@ -33,9 +33,9 @@ class QgsComposerLegendStyle
// set all margins
void setMargin( double margin );
void writeXML( const QString& name, QDomElement& elem, QDomDocument & doc ) const;
void writeXml( const QString& name, QDomElement& elem, QDomDocument & doc ) const;
void readXML( const QDomElement& elem, const QDomDocument& doc );
void readXml( const QDomElement& elem, const QDomDocument& doc );
/** Get name for style, used in project file */
static QString styleName( Style s );

6
python/core/composer/qgscomposermap.sip
View File

@ -256,7 +256,7 @@ class QgsComposerMap : QgsComposerItem
void setOffset( double xOffset, double yOffset );
/** True if composer map renders a WMS layer*/
bool containsWMSLayer() const;
bool containsWmsLayer() const;
/** True if composer map contains layers with blend modes or flattened layers for vectors */
bool containsAdvancedEffects() const;
@ -265,13 +265,13 @@ class QgsComposerMap : QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc Dom document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom node corresponding to 'ComposerMap' tag
* @param doc is Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Enables a coordinate grid that is shown on top of this composermap.
* @deprecated use grid()->setEnabled() or grids() instead

6
python/core/composer/qgscomposermapgrid.sip
View File

@ -95,7 +95,7 @@ class QgsComposerMapGridStack : QgsComposerMapItemStack
* @returns true if read was successful
* @see writeXML
*/
bool readXML( const QDomElement& elem, const QDomDocument& doc );
bool readXml( const QDomElement& elem, const QDomDocument& doc );
/** Calculates the maximum distance grids within the stack extend
* beyond the QgsComposerMap's item rect
@ -259,14 +259,14 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @param doc DOM document
* @see readXML
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets grid state from a DOM document
* @param itemElem is DOM node corresponding to a 'ComposerMapGrid' tag
* @param doc is DOM document
* @see writeXML
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Sets the CRS for the grid.
* @param crs coordinate reference system for grid

8
python/core/composer/qgscomposermapitem.sip
View File

@ -28,14 +28,14 @@ class QgsComposerMapItem : QgsComposerObject
* @param doc DOM document
* @see readXML
*/
virtual bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
virtual bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets map item state from a DOM document
* @param itemElem is DOM node corresponding to a 'ComposerMapGrid' tag
* @param doc is DOM document
* @see writeXML
*/
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
virtual bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Sets composer map for the item
* @param map composer map
@ -121,7 +121,7 @@ class QgsComposerMapItemStack
* @returns true if write was successful
* @see readXML
*/
virtual bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
virtual bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets the item stack's state from a DOM document
* @param elem is DOM node corresponding to 'a ComposerMap' tag
@ -129,7 +129,7 @@ class QgsComposerMapItemStack
* @returns true if read was successful
* @see writeXML
*/
virtual bool readXML( const QDomElement& elem, const QDomDocument& doc ) = 0;
virtual bool readXml( const QDomElement& elem, const QDomDocument& doc ) = 0;
/** Draws the items from the stack on a specified painter
* @param painter destination QPainter

6
python/core/composer/qgscomposermapoverview.sip
View File

@ -94,7 +94,7 @@ class QgsComposerMapOverviewStack : QgsComposerMapItemStack
* @returns true if read was successful
* @see writeXML
*/
bool readXML( const QDomElement& elem, const QDomDocument& doc );
bool readXml( const QDomElement& elem, const QDomDocument& doc );
};
@ -131,14 +131,14 @@ class QgsComposerMapOverview : QgsComposerMapItem
* @param doc DOM document
* @see readXML
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets overview state from a DOM document
* @param itemElem is DOM node corresponding to a 'ComposerMapOverview' tag
* @param doc is DOM document
* @see writeXML
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
bool usesAdvancedEffects() const;

8
python/core/composer/qgscomposermultiframe.sip
View File

@ -144,7 +144,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @param ignoreFrames set to false to avoid writing state information about child frames into DOM
* @see _writeXML
*/
virtual bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const = 0;
virtual bool writeXml( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const = 0;
/** Stores state information about base multiframe object in DOM element. Implementations of writeXML
* should call this method.
@ -153,7 +153,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @param ignoreFrames set to false to avoid writing state information about child frames into DOM
* @see writeXML
*/
bool _writeXML( QDomElement& elem, QDomDocument& doc, bool ignoreFrames = false ) const;
bool _writeXml( QDomElement& elem, QDomDocument& doc, bool ignoreFrames = false ) const;
/** Reads multiframe state information from a DOM element. Implementations of readXML
* should also call the _readXML method to restore general multiframe properties.
@ -162,7 +162,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @param ignoreFrames set to false to avoid read state information about child frames from DOM
* @see _readXML
*/
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false ) = 0;
virtual bool readXml( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false ) = 0;
/** Restores state information about base multiframe object from a DOM element. Implementations of readXML
* should call this method.
@ -171,7 +171,7 @@ class QgsComposerMultiFrame: QgsComposerObject
* @param ignoreFrames set to false to avoid reading state information about child frames from DOM
* @see readXML
*/
bool _readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
bool _readXml( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
/** Returns the parent composition for the multiframe.
* @returns composition

8
python/core/composer/qgscomposernodesitem.sip
View File

@ -52,7 +52,7 @@ class QgsComposerNodesItem: QgsComposerItem
* @param itemElem is Dom node corresponding to item tag
* @param doc is Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Remove a node from the shape.
* @param index of the node to delete
@ -80,7 +80,7 @@ class QgsComposerNodesItem: QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc write template file
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
protected:
@ -94,10 +94,10 @@ class QgsComposerNodesItem: QgsComposerItem
virtual void _draw( QPainter *painter ) = 0;
/** Method called in readXML. */
virtual void _readXMLStyle( const QDomElement &elmt ) = 0;
virtual void _readXmlStyle( const QDomElement &elmt ) = 0;
/** Method called in writeXML. */
virtual void _writeXMLStyle( QDomDocument &doc, QDomElement &elmt ) const = 0;
virtual void _writeXmlStyle( QDomDocument &doc, QDomElement &elmt ) const = 0;
/** Rescale the current shape according to the boudning box. Useful when
* the shape is resized thanks to the rubber band. */

4
python/core/composer/qgscomposerobject.sip
View File

@ -76,13 +76,13 @@ class QgsComposerObject : QObject
* @param elem is DOM element corresponding to item tag
* @param doc is the DOM document
*/
virtual bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
virtual bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets item state from DOM element
* @param itemElem is DOM node corresponding to item tag
* @param doc is DOM document
*/
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
virtual bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Returns a reference to the data defined settings for one of the item's data defined properties.
* @param property data defined property to return

4
python/core/composer/qgscomposerpicture.sip
View File

@ -85,13 +85,13 @@ class QgsComposerPicture: QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc is Dom document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom node corresponding to item tag
* @param doc is Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Returns the rotation used for drawing the picture within the composer item
* @deprecated Use pictureRotation() instead

4
python/core/composer/qgscomposerpolygon.sip
View File

@ -31,10 +31,10 @@ class QgsComposerPolygon: QgsComposerNodesItem
void _draw( QPainter *painter );
/** Read symbol in XML. */
void _readXMLStyle( const QDomElement &elmt );
void _readXmlStyle( const QDomElement &elmt );
/** Write the symbol in an XML document. */
void _writeXMLStyle( QDomDocument &doc, QDomElement &elmt ) const;
void _writeXmlStyle( QDomDocument &doc, QDomElement &elmt ) const;
/** Create a default symbol. */
void createDefaultPolygonStyleSymbol();

4
python/core/composer/qgscomposerpolyline.sip
View File

@ -31,10 +31,10 @@ class QgsComposerPolyline: QgsComposerNodesItem
void _draw( QPainter *painter );
/** Read symbol in XML. */
void _readXMLStyle( const QDomElement &elmt );
void _readXmlStyle( const QDomElement &elmt );
/** Write the symbol in an XML document. */
void _writeXMLStyle( QDomDocument &doc, QDomElement &elmt ) const;
void _writeXmlStyle( QDomDocument &doc, QDomElement &elmt ) const;
/** Create a default symbol. */
void createDefaultPolylineStyleSymbol();

4
python/core/composer/qgscomposerscalebar.sip
View File

@ -266,13 +266,13 @@ class QgsComposerScaleBar: QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc Dom document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom node corresponding to item tag
* @param doc is Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Moves scalebar position to the left / right depending on alignment and change in item width*/
void correctXPositionAlignment( double width, double widthAfter );

4
python/core/composer/qgscomposershape.sip
View File

@ -27,13 +27,13 @@ class QgsComposerShape: QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc write template file
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom node corresponding to item tag
* @param doc is Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
//setters and getters
QgsComposerShape::Shape shapeType() const;

8
python/core/composer/qgscomposertable.sip
View File

@ -28,8 +28,8 @@ class QgsComposerTable: QgsComposerItem
/** \brief Reimplementation of QCanvasItem::paint*/
virtual void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget );
virtual bool writeXML( QDomElement& elem, QDomDocument & doc ) const = 0;
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc ) = 0;
virtual bool writeXml( QDomElement& elem, QDomDocument & doc ) const = 0;
virtual bool readXml( const QDomElement& itemElem, const QDomDocument& doc ) = 0;
/** Sets the margin distance between cell borders and their contents.
* @param d margin for cell contents
@ -262,7 +262,7 @@ class QgsComposerTable: QgsComposerItem
* @see tableReadXML
* @see writeXML
*/
bool tableWriteXML( QDomElement& itemElem, QDomDocument& doc ) const;
bool tableWriteXml( QDomElement& itemElem, QDomDocument& doc ) const;
/** Reads the table's common properties from xml.
* @param itemElem a QDomElement holding the table's desired properties.
@ -270,5 +270,5 @@ class QgsComposerTable: QgsComposerItem
* @see tableWriteXML
* @see readXML
*/
bool tableReadXML( const QDomElement& itemElem, const QDomDocument& doc );
bool tableReadXml( const QDomElement& itemElem, const QDomDocument& doc );
};

4
python/core/composer/qgscomposertablecolumn.sip
View File

@ -21,14 +21,14 @@ class QgsComposerTableColumn: QObject
* @note added in 2.3
* @see readXML
*/
virtual bool writeXML( QDomElement& columnElem, QDomDocument & doc ) const;
virtual bool writeXml( QDomElement& columnElem, QDomDocument & doc ) const;
/** Reads the column's properties from xml.
* @param columnElem a QDomElement holding the column's desired properties.
* @note added in 2.3
* @see writeXML
*/
virtual bool readXML( const QDomElement& columnElem );
virtual bool readXml( const QDomElement& columnElem );
/** Returns the width for a column.
* @returns column width in mm, or 0 if column width is automatically calculated.

8
python/core/composer/qgscomposertablev2.sip
View File

@ -42,13 +42,13 @@ class QgsComposerTableStyle
* @param doc QDomDocument for the destination XML.
* @see readXML
*/
bool writeXML( QDomElement& styleElem, QDomDocument & doc ) const;
bool writeXml( QDomElement& styleElem, QDomDocument & doc ) const;
/** Reads the style's properties from XML.
* @param styleElem a QDomElement holding the style's desired properties.
* @see writeXML
*/
bool readXML( const QDomElement& styleElem );
bool readXml( const QDomElement& styleElem );
};
@ -393,8 +393,8 @@ class QgsComposerTableV2: QgsComposerMultiFrame
//reimplemented to return min frame height
virtual QSizeF minFrameSize( const int frameIndex = -1 ) const;
virtual bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
virtual bool writeXml( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
virtual bool readXml( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
virtual QSizeF totalSize() const;
virtual void render( QPainter* p, const QRectF& renderExtent, const int frameIndex );

4
python/core/composer/qgscomposertexttable.sip
View File

@ -33,14 +33,14 @@ class QgsComposerTextTable: QgsComposerTable
* @param doc QDomDocument for the destination xml.
* @see readXML
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Reads the properties specific to a text table from xml.
* @param itemElem a QDomElement holding the text table's desired properties.
* @param doc QDomDocument for the source xml.
* @see writeXML
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
/** Queries the text table for text to show in the cells.
* @param attributeMaps list of QgsAttributeMaps where the cell text will be stored

6
python/core/composer/qgscomposition.sip
View File

@ -436,10 +436,10 @@ class QgsComposition : QGraphicsScene
double pointFontSize( int pixelSize ) const /Deprecated/;
/** Writes settings to xml (paper dimension)*/
bool writeXML( QDomElement& composerElem, QDomDocument& doc );
bool writeXml( QDomElement& composerElem, QDomDocument& doc );
/** Reads settings from xml file*/
bool readXML( const QDomElement& compositionElem, const QDomDocument& doc );
bool readXml( const QDomElement& compositionElem, const QDomDocument& doc );
/** Load a template document
* @param doc template document
@ -461,7 +461,7 @@ class QgsComposition : QGraphicsScene
* @param pasteInPlace whether the position should be kept but mapped to the page origin. (the page is the page under to the mouse cursor)
* @note parameters mapsToRestore, addUndoCommands pos and pasteInPlace not available in python bindings
*/
void addItemsFromXML( const QDomElement& elem, const QDomDocument& doc );
void addItemsFromXml( const QDomElement& elem, const QDomDocument& doc );
/** Adds item to z list. Usually called from constructor of QgsComposerItem*/
void addItemToZList( QgsComposerItem* item );

4
python/core/composer/qgslegendmodel.sip
View File

@ -49,8 +49,8 @@ class QgsLegendModel : QStandardItemModel
void updateItemText( QStandardItem* item );
bool writeXML( QDomElement& composerLegendElem, QDomDocument& doc ) const;
bool readXML( const QDomElement& legendModelElem, const QDomDocument& doc );
bool writeXml( QDomElement& composerLegendElem, QDomDocument& doc ) const;
bool readXml( const QDomElement& legendModelElem, const QDomDocument& doc );
Qt::DropActions supportedDropActions() const;
Qt::ItemFlags flags( const QModelIndex &index ) const;

4
python/core/composer/qgspaperitem.sip
View File

@ -35,13 +35,13 @@ class QgsPaperItem : QgsComposerItem
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc Dom document
*/
bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
bool writeXml( QDomElement& elem, QDomDocument & doc ) const;
/** Sets state from Dom document
* @param itemElem is Dom node corresponding to item tag
* @param doc is the Dom document
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
bool readXml( const QDomElement& itemElem, const QDomDocument& doc );
virtual void setSceneRect( const QRectF& rectangle );

6
python/core/layertree/qgslayertreegroup.sip
View File

@ -56,11 +56,11 @@ class QgsLayerTreeGroup : QgsLayerTreeNode
QgsLayerTreeGroup* findGroup( const QString& name );
//! Read group (tree) from XML element <layer-tree-group> and return the newly created group (or null on error)
static QgsLayerTreeGroup* readXML( QDomElement& element ) /Factory/;
static QgsLayerTreeGroup* readXml( QDomElement& element ) /Factory/;
//! Write group (tree) as XML element <layer-tree-group> and add it to the given parent element
virtual void writeXML( QDomElement& parentElement );
virtual void writeXml( QDomElement& parentElement );
//! Read children from XML and append them to the group.
void readChildrenFromXML( QDomElement& element );
void readChildrenFromXml( QDomElement& element );
//! Return text representation of the tree. For debugging purposes only.
virtual QString dump() const;

4
python/core/layertree/qgslayertreelayer.sip
View File

@ -37,8 +37,8 @@ class QgsLayerTreeLayer : QgsLayerTreeNode
Qt::CheckState isVisible() const;
void setVisible( Qt::CheckState visible );
static QgsLayerTreeLayer* readXML( QDomElement& element ) /Factory/;
virtual void writeXML( QDomElement& parentElement );
static QgsLayerTreeLayer* readXml( QDomElement& element ) /Factory/;
virtual void writeXml( QDomElement& parentElement );
virtual QString dump() const;

9
python/core/layertree/qgslayertreemodellegendnode.sip
View File

@ -235,13 +235,18 @@ class QgsRasterSymbolLegendNode : QgsLayerTreeModelLegendNode
*
* @note added in 2.8
*/
class QgsWMSLegendNode : QgsLayerTreeModelLegendNode
class QgsWmsLegendNode : QgsLayerTreeModelLegendNode
{
%TypeHeaderCode
#include <qgslayertreemodellegendnode.h>
%End
public:
QgsWMSLegendNode( QgsLayerTreeLayer* nodeLayer, QObject* parent /TransferThis/ = nullptr );
/** Constructor for QgsWmsLegendNode.
* @param nodeLayer layer node
* @param parent parent object
*/
QgsWmsLegendNode( QgsLayerTreeLayer* nodeLayer, QObject* parent /TransferThis/ = nullptr );
virtual QVariant data( int role ) const;

8
python/core/layertree/qgslayertreenode.sip
View File

@ -77,9 +77,9 @@ class QgsLayerTreeNode : QObject
QList<QgsLayerTreeNode*> children();
//! Read layer tree from XML. Returns new instance
static QgsLayerTreeNode *readXML( QDomElement &element );
static QgsLayerTreeNode *readXml( QDomElement &element );
//! Write layer tree to XML
virtual void writeXML( QDomElement &parentElement ) = 0;
virtual void writeXml( QDomElement &parentElement ) = 0;
//! Return string with layer tree structure. For debug purposes only
virtual QString dump() const = 0;
@ -124,8 +124,8 @@ class QgsLayerTreeNode : QObject
QgsLayerTreeNode( NodeType t );
void readCommonXML( QDomElement &element );
void writeCommonXML( QDomElement &element );
void readCommonXml( QDomElement &element );
void writeCommonXml( QDomElement &element );
//! Low-level insertion of children to the node. The children must not have any parent yet!
void insertChildrenPrivate( int index, QList<QgsLayerTreeNode*> nodes );

4
python/core/qgsactionmanager.sip
View File

@ -124,10 +124,10 @@ class QgsActionManager
//! Writes the actions out in XML format
bool writeXML( QDomNode& layer_node, QDomDocument& doc ) const;
bool writeXml( QDomNode& layer_node, QDomDocument& doc ) const;
//! Reads the actions in in XML format
bool readXML( const QDomNode& layer_node );
bool readXml( const QDomNode& layer_node );
int size() const;
/**

4
python/core/qgsattributeaction.sip
View File

@ -115,10 +115,10 @@ class QgsAttributeAction
//! Writes the actions out in XML format
bool writeXML( QDomNode& layer_node, QDomDocument& doc ) const;
bool writeXml( QDomNode& layer_node, QDomDocument& doc ) const;
//! Reads the actions in in XML format
bool readXML( const QDomNode& layer_node );
bool readXml( const QDomNode& layer_node );
int size() const;
/**

17
python/core/qgscoordinatereferencesystem.sip
View File

@ -107,7 +107,7 @@
* In some cases (most prominently when loading a map layer), QGIS will try to ensure
* that the given map layer CRS is valid using validate() call. If not, a custom
* validation function will be called - such function may for example show a GUI
* for manual CRS selection. The validation function is configured using setCustomSrsValidation().
* for manual CRS selection. The validation function is configured using setCustomCrsValidation().
* If validation fails or no validation function is set, the default CRS is assigned
* (WGS84). QGIS application registers its validation function that will act according
* to user's settings (either show CRS selector dialog or use project/custom CRS).
@ -319,7 +319,7 @@ class QgsCoordinateReferenceSystem
*
* @note It is not usually necessary to use this function, unless you
* are trying to force this CRS to be valid.
* @see setCustomSrsValidation(), customSrsValidation()
* @see setCustomCrsValidation(), customCrsValidation()
*/
void validate();
@ -347,21 +347,20 @@ class QgsCoordinateReferenceSystem
* @param theNode The node from which state will be restored
* @return bool True on success, False on failure
*/
bool readXML( const QDomNode & theNode );
bool readXml( const QDomNode & theNode );
/** Stores state to the given Dom node in the given document.
* @param theNode The node in which state will be restored
* @param theDoc The document in which state will be stored
* @return bool True on success, False on failure
*/
bool writeXML( QDomNode & theNode, QDomDocument & theDoc ) const;
bool writeXml( QDomNode & theNode, QDomDocument & theDoc ) const;
/** Sets custom function to force valid CRS
* QGIS uses implementation in QgisGui::customSrsValidation
* QGIS uses implementation in QgisGui::customCrsValidation
* @note not available in python bindings
*/
// static void setCustomSrsValidation( CUSTOM_CRS_VALIDATION f );
// static void setCustomCrsValidation( CUSTOM_CRS_VALIDATION f );
/** Gets custom function
* @note not available in python bindings
@ -470,10 +469,10 @@ class QgsCoordinateReferenceSystem
/** Save the proj4-string as a custom CRS
* @returns bool true if success else false
*/
bool saveAsUserCRS( const QString& name );
bool saveAsUserCrs( const QString& name );
/** Returns auth id of related geographic CRS*/
QString geographicCRSAuthId() const;
QString geographicCrsAuthId() const;
/** Returns a list of recently used projections
* @returns list of srsid for recently used projections

12
python/core/qgscrscache.sip
View File

@ -26,7 +26,7 @@ class QgsCoordinateTransformCache
};
/** \ingroup core
* \class QgsCRSCache
* \class QgsCrsCache
* \brief Caches QgsCoordinateReferenceSystem construction, which may be expensive.
*
* QgsCRSCache maintains a cache of previously constructed coordinate systems, so that
@ -36,7 +36,7 @@ class QgsCoordinateTransformCache
* constructors.
*/
class QgsCRSCache
class QgsCrsCache
{
%TypeHeaderCode
#include <qgscrscache.h>
@ -45,7 +45,7 @@ class QgsCRSCache
public:
//! Returns a pointer to the QgsCRSCache singleton
static QgsCRSCache* instance();
static QgsCrsCache* instance();
/** Returns the CRS for authid, e.g. 'EPSG:4326' (or an invalid CRS in case of error)
* @deprecated use crsByOgcWmsCrs() instead
@ -94,12 +94,12 @@ class QgsCRSCache
* CRS has been changed.
* @param authid CRS auth ID, eg "EPSG:4326" or "USER:100009"
*/
void updateCRSCache( const QString& authid );
void updateCrsCache( const QString& authid );
protected:
QgsCRSCache();
QgsCrsCache();
private:
QgsCRSCache( const QgsCRSCache& other );
QgsCrsCache( const QgsCrsCache& other );
};

2
python/core/qgsdataitem.sip
View File

@ -287,7 +287,7 @@ class QgsLayerItem : QgsDataItem
/** Returns the supported CRS
* @note Added in 2.8
*/
QStringList supportedCRS();
QStringList supportedCrs();
/** Returns the supported formats
* @note Added in 2.8

4
python/core/qgsdatumtransformstore.sip
View File

@ -29,8 +29,8 @@ class QgsDatumTransformStore
QgsCoordinateTransform transformation( QgsMapLayer* layer ) const;
void readXML( const QDomNode& parentNode );
void readXml( const QDomNode& parentNode );
void writeXML( QDomNode& parentNode, QDomDocument& theDoc ) const;
void writeXml( QDomNode& parentNode, QDomDocument& theDoc ) const;
};

24
python/core/qgsdiagramrendererv2.sip
View File

@ -224,8 +224,8 @@ class QgsDiagramLayerSettings
// TODO QGIS 3.0 - make private, rename to mShowAll
bool showAll;
void readXML( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXML( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
void readXml( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXml( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
/** Returns the set of any fields referenced by the layer's diagrams.
* @param context expression context the diagrams will be drawn using
@ -320,8 +320,8 @@ class QgsDiagramSettings
//! Scale diagrams smaller than mMinimumSize to mMinimumSize
double minimumSize;
void readXML( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXML( QDomElement& rendererElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
void readXml( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXml( QDomElement& rendererElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
/** Returns list of legend nodes for the diagram
* @note caller is responsible for deletion of QgsLayerTreeModelLegendNodes
@ -392,8 +392,8 @@ class QgsDiagramRendererV2
/** Returns list with all diagram settings in the renderer*/
virtual QList<QgsDiagramSettings> diagramSettings() const = 0;
virtual void readXML( const QDomElement& elem, const QgsVectorLayer* layer ) = 0;
virtual void writeXML( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const = 0;
virtual void readXml( const QDomElement& elem, const QgsVectorLayer* layer ) = 0;
virtual void writeXml( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const = 0;
/** Returns list of legend nodes for the diagram
* @note caller is responsible for deletion of QgsLayerTreeModelLegendNodes
@ -469,8 +469,8 @@ class QgsDiagramRendererV2
static int dpiPaintDevice( const QPainter* );
//read / write diagram
void _readXML( const QDomElement& elem, const QgsVectorLayer* layer );
void _writeXML( QDomElement& rendererElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
void _readXml( const QDomElement& elem, const QgsVectorLayer* layer );
void _writeXml( QDomElement& rendererElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
};
/** Renders the diagrams for all features with the same settings*/
@ -494,8 +494,8 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRendererV2
QList<QgsDiagramSettings> diagramSettings() const;
void readXML( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXML( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
void readXml( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXml( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
virtual QList< QgsLayerTreeModelLegendNode* > legendItems( QgsLayerTreeLayer* nodeLayer ) const /Factory/;
@ -549,8 +549,8 @@ class QgsLinearlyInterpolatedDiagramRenderer : QgsDiagramRendererV2
bool classificationAttributeIsExpression() const;
void setClassificationAttributeIsExpression( bool isExpression );
void readXML( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXML( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
void readXml( const QDomElement& elem, const QgsVectorLayer* layer );
void writeXml( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;
virtual QList< QgsLayerTreeModelLegendNode* > legendItems( QgsLayerTreeLayer* nodeLayer ) const /Factory/;

4
python/core/qgsmaplayer.sip
View File

@ -346,7 +346,7 @@ class QgsMapLayer : QObject
@returns true if successful
*/
bool readLayerXML( const QDomElement& layerElement );
bool readLayerXml( const QDomElement& layerElement );
/** Stores state in Dom node
* @param layerElement is a Dom element corresponding to ``maplayer'' tag
@ -364,7 +364,7 @@ class QgsMapLayer : QObject
*
* @returns true if successful
*/
bool writeLayerXML( QDomElement& layerElement, QDomDocument& document, const QString& relativeBasePath = QString::null ) const;
bool writeLayerXml( QDomElement& layerElement, QDomDocument& document, const QString& relativeBasePath = QString::null ) const;
/** Returns the given layer as a layer definition document
* Layer definitions store the data source as well as styling and custom properties.

2
python/core/qgsmaplayerrenderer.sip
View File

@ -16,5 +16,5 @@ class QgsMapLayerRenderer
QStringList errors() const;
//! Get access to the ID of the layer rendered by this class
QString layerID() const;
QString layerId() const;
};

7
python/core/qgsmaprenderer.sip
View File

@ -282,10 +282,10 @@ class QgsMapRenderer : QObject
void updateFullExtent();
//! read settings
bool readXML( QDomNode & theNode );
bool readXml( QDomNode & theNode );
//! write settings
bool writeXML( QDomNode & theNode, QDomDocument & theDoc );
bool writeXml( QDomNode & theNode, QDomDocument & theDoc );
//! Accessor for render context
QgsRenderContext* rendererContext();
@ -344,7 +344,8 @@ class QgsMapRenderer : QObject
* @note Added in 2.4 */
void hasCrsTransformEnabledChanged( bool flag );
void destinationSrsChanged();
//! Emitted when the renderer's destination CRS is changed
void destinationCrsChanged();
//! @deprecated in 2.4 - not emitted anymore
void updateMap();

4
python/core/qgsmapsettings.sip
View File

@ -227,9 +227,9 @@ class QgsMapSettings
/* serialization */
void readXML( QDomNode& theNode );
void readXml( QDomNode& theNode );
void writeXML( QDomNode& theNode, QDomDocument& theDoc );
void writeXml( QDomNode& theNode, QDomDocument& theDoc );
/** Sets the segmentation tolerance applied when rendering curved geometries
@param tolerance the segmentation tolerance*/

6
python/core/qgsowsconnection.sip
View File

@ -1,4 +1,4 @@
class QgsOWSConnection : QObject
class QgsOwsConnection : QObject
{
%TypeHeaderCode
#include <qgsowsconnection.h>
@ -10,10 +10,10 @@ class QgsOWSConnection : QObject
* @param theService service name: WMS,WFS,WCS
* @param theConnName connection name
*/
QgsOWSConnection( const QString & theService, const QString & theConnName );
QgsOwsConnection( const QString & theService, const QString & theConnName );
//! Destructor
~QgsOWSConnection();
~QgsOwsConnection();
/** Returns the list of connections for the specified service */
static QStringList connectionList( const QString & theService );

6
python/core/qgspointlocator.sip
View File

@ -21,11 +21,11 @@ class QgsPointLocator : QObject
public:
/** Construct point locator for a layer.
* @arg destCRS if a valid QgsCoordinateReferenceSystem is passed then the locator will
* @arg destinationCrs if a valid QgsCoordinateReferenceSystem is passed then the locator will
* do the searches on data reprojected to the given CRS
* @arg extent if not null, will index only a subset of the layer
*/
explicit QgsPointLocator( QgsVectorLayer* layer, const QgsCoordinateReferenceSystem& destCRS = QgsCoordinateReferenceSystem(),
explicit QgsPointLocator( QgsVectorLayer* layer, const QgsCoordinateReferenceSystem& destinationCrs = QgsCoordinateReferenceSystem(),
const QgsRectangle* extent = nullptr );
~QgsPointLocator();
@ -35,7 +35,7 @@ class QgsPointLocator : QObject
QgsVectorLayer* layer() const;
//! Get destination CRS - may be an invalid QgsCoordinateReferenceSystem if not doing OTF reprojection
//! @note added in QGIS 2.14
QgsCoordinateReferenceSystem destCRS() const;
QgsCoordinateReferenceSystem destinationCrs() const;
//! Get extent of the area point locator covers - if null then it caches the whole layer
//! @note added in QGIS 2.14
const QgsRectangle* extent() const;

12
python/core/qgsprojectproperty.sip
View File

@ -34,7 +34,7 @@ class QgsProperty
*
* Used for restoring properties from project file
*/
virtual bool readXML( QDomNode & keyNode ) = 0;
virtual bool readXml( QDomNode & keyNode ) = 0;
/**
* adds property hierarchy to given Dom element
@ -45,7 +45,7 @@ class QgsProperty
* @param element the parent (or encompassing) property element
* @param document the overall project file Dom document
*/
virtual bool writeXML( const QString & nodeName,
virtual bool writeXml( const QString & nodeName,
QDomElement & element,
QDomDocument & document ) = 0;
@ -91,9 +91,9 @@ class QgsPropertyValue : QgsProperty
void dump( int tabs = 0 ) const;
bool readXML( QDomNode & keyNode );
bool readXml( QDomNode & keyNode );
bool writeXML( const QString & nodeName,
bool writeXml( const QString & nodeName,
QDomElement & element,
QDomDocument & document );
@ -154,9 +154,9 @@ class QgsPropertyKey : QgsProperty
void dump( int tabs = 0 ) const;
bool readXML( QDomNode & keyNode );
bool readXml( QDomNode & keyNode );
bool writeXML( const QString &nodeName, QDomElement & element, QDomDocument & document );
bool writeXml( const QString &nodeName, QDomElement & element, QDomDocument & document );
/// how many elements are contained within this one?
int count() const;

4
python/core/qgsrelation.sip
View File

@ -32,7 +32,7 @@ class QgsRelation
*
* @return A relation
*/
static QgsRelation createFromXML( const QDomNode& node );
static QgsRelation createFromXml( const QDomNode& node );
/**
* Writes a relation to an XML structure. Used for saving .qgs projects
@ -40,7 +40,7 @@ class QgsRelation
* @param node The parent node in which the relation will be created
* @param doc The document in which the relation will be saved
*/
void writeXML( QDomNode& node, QDomDocument& doc ) const;
void writeXml( QDomNode& node, QDomDocument& doc ) const;
/**
* Set a name for this relation

8
python/core/qgsvectorlayer.sip
View File

@ -1034,11 +1034,11 @@ class QgsVectorLayer : QgsMapLayer
const QMap< QString, QString >& attributeAliases() const;
const QSet<QString>& excludeAttributesWMS() const;
void setExcludeAttributesWMS( const QSet<QString>& att );
const QSet<QString>& excludeAttributesWms() const;
void setExcludeAttributesWms( const QSet<QString>& att );
const QSet<QString>& excludeAttributesWFS() const;
void setExcludeAttributesWFS( const QSet<QString>& att );
const QSet<QString>& excludeAttributesWfs() const;
void setExcludeAttributesWfs( const QSet<QString>& att );
/** Delete an attribute field (but does not commit it) */
bool deleteAttribute( int attr );

4
python/core/qgsvisibilitypresetcollection.sip
View File

@ -92,13 +92,13 @@ class QgsVisibilityPresetCollection : QObject
* @param doc DOM document
* @see writeXML
*/
void readXML( const QDomDocument& doc );
void readXml( const QDomDocument& doc );
/** Writes the preset collection state to XML.
* @param doc DOM document
* @see readXML
*/
void writeXML( QDomDocument& doc );
void writeXml( QDomDocument& doc );
/** Static method for adding visible layers from a layer tree group to a preset
* record.

4
python/core/raster/qgsbrightnesscontrastfilter.sip
View File

@ -23,8 +23,8 @@ class QgsBrightnessContrastFilter : QgsRasterInterface
void setContrast( int contrast );
int contrast() const;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
/** Sets base class members from xml. Usually called from create() methods of subclasses*/
void readXML( const QDomElement& filterElem );
void readXml( const QDomElement& filterElem );
};

4
python/core/raster/qgscontrastenhancement.sip
View File

@ -71,9 +71,9 @@ class QgsContrastEnhancement
/** \brief Return the minimum value for the contrast enhancement range. */
void setMinimumValue( double, bool generateTable = true );
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
void readXML( const QDomElement& elem );
void readXml( const QDomElement& elem );
private:

2
python/core/raster/qgshillshaderenderer.sip
View File

@ -33,7 +33,7 @@ class QgsHillshadeRenderer : QgsRasterRenderer
QgsRasterBlock *block( int bandNo, const QgsRectangle & extent, int width, int height ) /Factory/;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
QList<int> usesBands() const;

4
python/core/raster/qgshuesaturationfilter.sip
View File

@ -40,8 +40,8 @@ class QgsHueSaturationFilter : QgsRasterInterface
void setColorizeStrength( int colorizeStrength );
int colorizeStrength() const;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
/** Sets base class members from xml. Usually called from create() methods of subclasses*/
void readXML( const QDomElement& filterElem );
void readXml( const QDomElement& filterElem );
};

2
python/core/raster/qgsmultibandcolorrenderer.sip
View File

@ -33,7 +33,7 @@ class QgsMultiBandColorRenderer: QgsRasterRenderer
/** Takes ownership*/
void setBlueContrastEnhancement( QgsContrastEnhancement* ce /Transfer/ );
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
QList<int> usesBands() const;

2
python/core/raster/qgspalettedrasterrenderer.sip
View File

@ -30,7 +30,7 @@ class QgsPalettedRasterRenderer : QgsRasterRenderer
* @note added in 2.1 */
void setLabel( int idx, const QString& label );
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;

10
python/core/raster/qgsrasterdataprovider.sip
View File

@ -72,7 +72,7 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
/** Returns source data type for the band specified by number,
* source data type may be shorter than dataType
*/
virtual QGis::DataType srcDataType( int bandNo ) const = 0;
virtual QGis::DataType sourceDataType( int bandNo ) const = 0;
/** Returns data type for the band specified by number */
virtual int colorInterpretation( int theBandNo ) const;
@ -105,16 +105,16 @@ class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
virtual QgsRasterBlock *block( int theBandNo, const QgsRectangle &theExtent, int theWidth, int theHeight ) / Factory /;
/** Return true if source band has no data value */
virtual bool srcHasNoDataValue( int bandNo ) const;
virtual bool sourceHasNoDataValue( int bandNo ) const;
/** \brief Get source nodata value usage */
virtual bool useSrcNoDataValue( int bandNo ) const;
virtual bool useSourceNoDataValue( int bandNo ) const;
/** \brief Set source nodata value usage */
virtual void setUseSrcNoDataValue( int bandNo, bool use );
virtual void setUseSourceNoDataValue( int bandNo, bool use );
/** Value representing no data value. */
virtual double srcNoDataValue( int bandNo ) const;
virtual double sourceNoDataValue( int bandNo ) const;
virtual void setUserNoDataValue( int bandNo, const QgsRasterRangeList& noData );

8
python/core/raster/qgsrasterinterface.sip
View File

@ -98,7 +98,7 @@ class QgsRasterInterface
/** Returns source data type for the band specified by number,
* source data type may be shorter than dataType */
virtual QGis::DataType srcDataType( int bandNo ) const;
virtual QGis::DataType sourceDataType( int bandNo ) const;
/**
* Get the extent of the interface.
@ -149,7 +149,7 @@ class QgsRasterInterface
* It may be used to get info about original data, e.g. resolution to decide
* resampling etc.
*/
virtual QgsRasterInterface *srcInput();
virtual QgsRasterInterface *sourceInput();
/** \brief Get band statistics.
* @param theBandNo The band (number).
@ -219,9 +219,9 @@ class QgsRasterInterface
int theSampleSize = 0 );
/** Write base class members to xml. */
virtual void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
virtual void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
/** Sets base class members from xml. Usually called from create() methods of subclasses */
virtual void readXML( const QDomElement& filterElem );
virtual void readXml( const QDomElement& filterElem );
protected:

6
python/core/raster/qgsrasterprojector.sip
View File

@ -57,14 +57,14 @@ class QgsRasterProjector : QgsRasterInterface
int dataType( int bandNo ) const;
/** \brief set source and destination CRS */
void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS,
void setCrs( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS,
int srcDatumTransform = -1, int destDatumTransform = -1 );
/** \brief Get source CRS */
QgsCoordinateReferenceSystem srcCrs() const;
QgsCoordinateReferenceSystem sourceCrs() const;
/** \brief Get destination CRS */
QgsCoordinateReferenceSystem destCrs() const;
QgsCoordinateReferenceSystem destinationCrs() const;
/** \brief set maximum source resolution */
void setMaxSrcRes( double theMaxSrcXRes, double theMaxSrcYRes );

4
python/core/raster/qgsrasterrenderer.sip
View File

@ -55,7 +55,7 @@ class QgsRasterRenderer : QgsRasterInterface
virtual void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;
/** Sets base class members from xml. Usually called from create() methods of subclasses*/
void readXML( const QDomElement& rendererElem );
void readXml( const QDomElement& rendererElem );
/** Copies common properties like opacity / transparency data from other renderer.
* Useful when cloning renderers.
@ -72,7 +72,7 @@ class QgsRasterRenderer : QgsRasterInterface
protected:
/** Write upper class info into rasterrenderer element (called by writeXML method of subclasses)*/
void _writeXML( QDomDocument& doc, QDomElement& rasterRendererElem ) const;
void _writeXml( QDomDocument& doc, QDomElement& rasterRendererElem ) const;
private:

4
python/core/raster/qgsrasterresamplefilter.sip
View File

@ -32,9 +32,9 @@ class QgsRasterResampleFilter : QgsRasterInterface
void setMaxOversampling( double os );
double maxOversampling() const;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
/** Sets base class members from xml. Usually called from create() methods of subclasses*/
void readXML( const QDomElement& filterElem );
void readXml( const QDomElement& filterElem );
};

4
python/core/raster/qgsrastershader.sip
View File

@ -44,9 +44,9 @@ class QgsRasterShader
/** \brief Return the minimum value */
void setMinimumValue( double );
void writeXML( QDomDocument& doc, QDomElement& parent ) const;
void writeXml( QDomDocument& doc, QDomElement& parent ) const;
void readXML( const QDomElement& elem );
void readXml( const QDomElement& elem );
private:

4
python/core/raster/qgsrastertransparency.sip
View File

@ -56,7 +56,7 @@ class QgsRasterTransparency
/** True if there are no entries in the pixel lists except the nodata value*/
bool isEmpty() const;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
void readXML( const QDomElement& elem );
void readXml( const QDomElement& elem );
};

2
python/core/raster/qgssinglebandcolordatarenderer.sip
View File

@ -14,7 +14,7 @@ class QgsSingleBandColorDataRenderer: QgsRasterRenderer
QgsRasterBlock* block( int bandNo, const QgsRectangle & extent, int width, int height ) / Factory /;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
QList<int> usesBands() const;

2
python/core/raster/qgssinglebandgrayrenderer.sip
View File

@ -27,7 +27,7 @@ class QgsSingleBandGrayRenderer: QgsRasterRenderer
void setGradient( Gradient theGradient );
Gradient gradient() const;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;

2
python/core/raster/qgssinglebandpseudocolorrenderer.sip
View File

@ -19,7 +19,7 @@ class QgsSingleBandPseudoColorRenderer: QgsRasterRenderer
//! @note available in python as constShader
const QgsRasterShader* shader() const /PyName=constShader/;
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
void writeXml( QDomDocument& doc, QDomElement& parentElem ) const;
void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;

2
python/core/symbology-ng/qgscptcityarchive.sip
View File

@ -231,7 +231,7 @@ class QgsCptCitySelectionItem : QgsCptCityCollectionItem
QStringList selectionsList() const;
protected:
void parseXML();
void parseXml();
};
/** An "All ramps item", which contains all items in a flat hierarchy */

4
python/core/symbology-ng/qgsstylev2.sip
View File

@ -257,10 +257,10 @@ class QgsStyleV2 : QObject
QStringList symbolsOfSmartgroup( StyleEntity type, int id );
//! Exports the style as a XML file
bool exportXML( const QString& filename );
bool exportXml( const QString& filename );
//! Imports the symbols and colorramps into the default style database from the given XML file
bool importXML( const QString& filename );
bool importXml( const QString& filename );
signals:
void symbolSaved( const QString& name, QgsSymbolV2* symbol );

2
python/gui/auth/qgsauthconfigselect.sip
View File

@ -42,5 +42,5 @@ class QgsAuthConfigUriEdit : QDialog
QString dataSourceUri();
static bool hasConfigID( const QString &txt );
static bool hasConfigId( const QString &txt );
};

8
python/gui/qgsannotationitem.sip
View File

@ -91,11 +91,11 @@ class QgsAnnotationItem: QgsMapCanvasItem
void setFrameBackgroundColor( const QColor& c );
QColor frameBackgroundColor() const;
virtual void writeXML( QDomDocument& doc ) const = 0;
virtual void readXML( const QDomDocument& doc, const QDomElement& itemElem ) = 0;
virtual void writeXml( QDomDocument& doc ) const = 0;
virtual void readXml( const QDomDocument& doc, const QDomElement& itemElem ) = 0;
void _writeXML( QDomDocument& doc, QDomElement& itemElem ) const;
void _readXML( const QDomDocument& doc, const QDomElement& annotationElem );
void _writeXml( QDomDocument& doc, QDomElement& itemElem ) const;
void _readXml( const QDomDocument& doc, const QDomElement& annotationElem );
protected:
void updateBoundingRect();

4
python/gui/qgsformannotationitem.sip
View File

@ -23,8 +23,8 @@ class QgsFormAnnotationItem: QObject, QgsAnnotationItem
void setDesignerForm( const QString& uiFile );
QString designerForm() const;
void writeXML( QDomDocument& doc ) const;
void readXML( const QDomDocument& doc, const QDomElement& itemElem );
void writeXml( QDomDocument& doc ) const;
void readXml( const QDomDocument& doc, const QDomElement& itemElem );
QgsVectorLayer* vectorLayer() const;
};

6
python/gui/qgsgroupwmsdatadialog.sip
View File

@ -1,4 +1,4 @@
class QgsGroupWMSDataDialog : QDialog
class QgsGroupWmsDataDialog : QDialog
{
%TypeHeaderCode
#include <qgsgroupwmsdatadialog.h>
@ -6,8 +6,8 @@ class QgsGroupWMSDataDialog : QDialog
public:
//! Constructor
QgsGroupWMSDataDialog( QWidget *parent /TransferThis/ = nullptr, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
//~QgsGroupWMSDataDialog();
QgsGroupWmsDataDialog( QWidget *parent /TransferThis/ = nullptr, const Qt::WindowFlags& fl = QgisGui::ModalDialogFlags );
//~QgsGroupWmsDataDialog();
//! return group WMS title
QString groupTitle();

4
python/gui/qgshtmlannotationitem.sip
View File

@ -20,8 +20,8 @@ class QgsHtmlAnnotationItem: QObject, QgsAnnotationItem
void setHTMLPage( const QString& htmlFile );
QString htmlPage() const;
void writeXML( QDomDocument& doc ) const;
void readXML( const QDomDocument& doc, const QDomElement& itemElem );
void writeXml( QDomDocument& doc ) const;
void readXml( const QDomDocument& doc, const QDomElement& itemElem );
QgsVectorLayer* vectorLayer() const;
};

5
python/gui/qgsmapoverviewcanvas.sip
View File

@ -34,8 +34,9 @@ class QgsMapOverviewCanvas : QWidget
// ### QGIS 3: rename so it does not look like getter, make protected
void hasCrsTransformEnabled( bool flag );
// ### QGIS 3: rename Srs to Crs, make protected
void destinationSrsChanged();
// ### QGIS 3: make protected
//! Should be called when the canvas destination CRS is changed
void destinationCrsChanged();
protected slots:
void mapRenderingFinished();

14
python/gui/qgsowssourceselect.sip
View File

@ -87,12 +87,12 @@ class QgsOWSSourceSelect : QDialog
virtual QStringList selectedLayersFormats();
//! Server CRS supported for currently selected layer item(s)
virtual QStringList selectedLayersCRSs();
virtual QStringList selectedLayersCrses();
//! List of times (temporalDomain timePosition/timePeriod for currently selected layer item(s)
virtual QStringList selectedLayersTimes();
//virtual QStringList layerCRS( int id );
//virtual QStringList layerCrs( int id );
//! Populate the connection list combo box
void populateConnectionList();
@ -104,10 +104,10 @@ class QgsOWSSourceSelect : QDialog
void clearFormats();
//! Set supported CRSs
void populateCRS();
void populateCrs();
//! Clear CRSs
void clearCRS();
void clearCrs();
//! Populate times
void populateTimes();
@ -148,8 +148,8 @@ class QgsOWSSourceSelect : QDialog
//! Returns a textual description for the authority id
QString descriptionForAuthId( const QString& authId );
void addWMSListRow( const QDomElement& item, int row );
void addWMSListItem( const QDomElement& el, int row, int column );
void addWmsListRow( const QDomElement& item, int row );
void addWmsListItem( const QDomElement& el, int row, int column );
virtual void enableLayersForCrs( QTreeWidgetItem *item );
@ -157,7 +157,7 @@ class QgsOWSSourceSelect : QDialog
QString selectedFormat();
//! Returns currently selected Crs
QString selectedCRS();
QString selectedCrs();
//! Returns currently selected time
QString selectedTime();

6
python/gui/qgssourceselectdialog.sip
View File

@ -26,11 +26,11 @@ class QgsSourceSelectDialog : public QDialog //, protected Ui::QgsSourceSelectBa
protected:
/** To be implemented in the child class. Called when a new connection is initiated. */
virtual bool connectToService( const QgsOWSConnection& connection ) = 0;
virtual bool connectToService( const QgsOwsConnection& connection ) = 0;
/** May be implemented in child classes for services which support customized queries. */
virtual void buildQuery( const QgsOWSConnection&, const QModelIndex& );
virtual void buildQuery( const QgsOwsConnection&, const QModelIndex& );
/** To be implemented in the child class. Constructs an URI for the specified service layer. */
virtual QString getLayerURI( const QgsOWSConnection& connection,
virtual QString getLayerURI( const QgsOwsConnection& connection,
const QString& layerTitle,
const QString& layerName,
const QString& crs = QString(),

4
python/gui/qgssvgannotationitem.sip
View File

@ -8,8 +8,8 @@ class QgsSvgAnnotationItem : QgsAnnotationItem
QgsSvgAnnotationItem( QgsMapCanvas* canvas );
~QgsSvgAnnotationItem();
void writeXML( QDomDocument& doc ) const;
void readXML( const QDomDocument& doc, const QDomElement& itemElem );
void writeXml( QDomDocument& doc ) const;
void readXml( const QDomDocument& doc, const QDomElement& itemElem );
void paint( QPainter* painter );

4
python/gui/qgstextannotationitem.sip
View File

@ -12,8 +12,8 @@ class QgsTextAnnotationItem: QgsAnnotationItem
/** Sets document (does not take ownership)*/
void setDocument( const QTextDocument* doc );
void writeXML( QDomDocument& doc ) const;
void readXML( const QDomDocument& doc, const QDomElement& itemElem );
void writeXml( QDomDocument& doc ) const;
void readXml( const QDomDocument& doc, const QDomElement& itemElem );
void paint( QPainter* painter );
};

4
python/server/qgsconfigcache.sip
View File

@ -33,8 +33,8 @@ class QgsConfigCache: QObject
QgsServerProjectParser* serverConfiguration( const QString& filePath );
QgsWCSProjectParser* wcsConfiguration( const QString& filePath, const QgsAccessControl* accessControl );
QgsWFSProjectParser* wfsConfiguration( const QString& filePath, const QgsAccessControl* accessControl );
QgsWMSConfigParser* wmsConfiguration( const QString& filePath, const QgsAccessControl* accessControl, const QMap<QString, QString>& parameterMap = QMap< QString, QString >() );
QgsWfsProjectParser* wfsConfiguration( const QString& filePath, const QgsAccessControl* accessControl );
QgsWmsConfigParser* wmsConfiguration( const QString& filePath, const QgsAccessControl* accessControl, const QMap<QString, QString>& parameterMap = QMap< QString, QString >() );
private:
QgsConfigCache();

6
python/server/qgsserverprojectparser.sip
View File

@ -50,11 +50,11 @@ class QgsServerProjectParser
void addLayerProjectSettings( QDomElement& layerElem, QDomDocument& doc, QgsMapLayer* currentLayer ) const;
QgsRectangle layerBoundingBoxInProjectCRS( const QDomElement& layerElem, const QDomDocument &doc ) const;
QgsRectangle layerBoundingBoxInProjectCrs( const QDomElement& layerElem, const QDomDocument &doc ) const;
bool crsSetForLayer( const QDomElement& layerElement, QSet<QString> &crsSet ) const;
const QgsCoordinateReferenceSystem& projectCRS() const;
const QgsCoordinateReferenceSystem& projectCrs() const;
QgsRectangle mapRectangle() const;
@ -71,7 +71,7 @@ class QgsServerProjectParser
QDomElement propertiesElem() const;
const QSet<QString>& restrictedLayers() const;
bool useLayerIDs() const;
bool useLayerIds() const;
const QHash< QString, QDomElement >& projectLayerElementsByName() const;
const QHash< QString, QDomElement >& projectLayerElementsById() const;

10
python/server/qgswfserver.sip
View File

@ -56,13 +56,13 @@ class QPainter;
a map<QString, QString>. This map is usually generated by a subclass of QgsWMSRequestHandler, which makes QgsWFSServer
independent from any server side technology*/
class QgsWFSServer: public QgsOWSServer
class QgsWfsServer: public QgsOWSServer
{
public:
/** Constructor. Takes parameter map and a pointer to a renderer object (does not take ownership)*/
QgsWFSServer( const QString& configFilePath, QMap<QString, QString>& parameters, QgsWFSProjectParser* cp,
QgsWfsServer( const QString& configFilePath, QMap<QString, QString>& parameters, QgsWfsProjectParser* cp,
QgsRequestHandler* rh, const QgsAccessControl* accessControl );
~QgsWFSServer();
~QgsWfsServer();
void executeRequest() override;
@ -81,11 +81,11 @@ class QgsWFSServer: public QgsOWSServer
QDomDocument transaction( const QString& requestBody );
/** Sets configuration parser for administration settings. Does not take ownership*/
void setAdminConfigParser( QgsWFSProjectParser* parser ) { mConfigParser = parser; }
void setAdminConfigParser( QgsWfsProjectParser* parser ) { mConfigParser = parser; }
private:
/** Don't use the default constructor*/
QgsWFSServer();
QgsWfsServer();
/** Get service address from REQUEST_URI if not specified in the configuration*/
QString serviceUrl() const;

8
python/server/qgswfsprojectparser.sip
View File

@ -16,7 +16,7 @@
***************************************************************************/
class QgsWFSProjectParser
class QgsWfsProjectParser
{
%TypeHeaderCode
#include "qgswfsprojectparser.h"
@ -24,8 +24,8 @@ class QgsWFSProjectParser
%End
public:
QgsWFSProjectParser( const QString& filePath, const QgsAccessControl* ac );
~QgsWFSProjectParser();
QgsWfsProjectParser( const QString& filePath, const QgsAccessControl* ac );
~QgsWfsProjectParser();
void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
QString serviceUrl() const;
@ -46,6 +46,6 @@ class QgsWFSProjectParser
private:
QgsWFSProjectParser( const QgsWFSProjectParser& rh );
QgsWfsProjectParser( const QgsWfsProjectParser& rh );
};

10
python/server/qgswmsconfigparser.sip
View File

@ -16,7 +16,7 @@
***************************************************************************/
class QgsWMSConfigParser
class QgsWmsConfigParser
{
%TypeHeaderCode
#include "qgswmsconfigparser.h"
@ -93,7 +93,7 @@ class QgsWMSConfigParser
virtual double imageQuality() const = 0;
// WMS GetFeatureInfo precision (decimal places)
virtual int WMSPrecision() const = 0;
virtual int wmsPrecision() const = 0;
//printing
@ -118,11 +118,11 @@ class QgsWMSConfigParser
virtual void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const = 0;
virtual bool useLayerIDs() const = 0;
virtual bool useLayerIds() const = 0;
private:
QgsWMSConfigParser();
virtual ~QgsWMSConfigParser();
QgsWmsConfigParser();
virtual ~QgsWmsConfigParser();
};

8
python/server/qgswmserver.sip
View File

@ -53,14 +53,14 @@ class QStandardItem;
a map<QString, QString>. This map is usually generated by a subclass of QgsWMSRequestHandler, which makes QgsWMSServer
independent from any server side technology*/
class QgsWMSServer: public QgsOWSServer
class QgsWmsServer: public QgsOWSServer
{
public:
/** Constructor. Does _NOT_ take ownership of
QgsConfigParser, QgsCapabilitiesCache and QgsMapRenderer*/
QgsWMSServer( const QString& configFilePath, QMap<QString, QString> &parameters, QgsWMSConfigParser* cp, QgsRequestHandler* rh,
QgsWmsServer( const QString& configFilePath, QMap<QString, QString> &parameters, QgsWmsConfigParser* cp, QgsRequestHandler* rh,
QgsMapRenderer* renderer, QgsCapabilitiesCache* capCache, const QgsAccessControl* accessControl );
~QgsWMSServer();
~QgsWmsServer();
void executeRequest() override;
@ -98,7 +98,7 @@ class QgsWMSServer: public QgsOWSServer
int getFeatureInfo( QDomDocument& result, const QString& version = "1.3.0" );
/** Sets configuration parser for administration settings. Does not take ownership*/
void setAdminConfigParser( QgsWMSConfigParser* parser ) { mConfigParser = parser; }
void setAdminConfigParser( QgsWmsConfigParser* parser ) { mConfigParser = parser; }
/** Returns the schemaExtension for WMS 1.3.0 capabilities*/
QDomDocument getSchemaExtension();

10
python/server/qgswmsprojectparser.sip
View File

@ -16,15 +16,15 @@
***************************************************************************/
class QgsWMSProjectParser : public QgsWMSConfigParser
class QgsWmsProjectParser : public QgsWmsConfigParser
{
%TypeHeaderCode
#include "qgswmsprojectparser.h"
%End
public:
QgsWMSProjectParser( const QString& filePath, const QgsAccessControl* ac );
virtual ~QgsWMSProjectParser();
QgsWmsProjectParser( const QString& filePath, const QgsAccessControl* ac );
virtual ~QgsWmsProjectParser();
/** Adds layer and style specific capabilities elements to the parent node. This includes the individual layers and styles, their description, native CRS, bounding boxes, etc.
@param fullProjectInformation If true: add extended project information (does not validate against WMS schema)*/
@ -52,7 +52,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
double maxWidth() const /*override*/ ;
double maxHeight() const /*override*/ ;
double imageQuality() const /*override*/ ;
int WMSPrecision() const /*override*/ ;
int wmsPrecision() const /*override*/ ;
//printing
//QgsComposition* initComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, QList< QgsComposerMap* >& mapList, //QList< QgsComposerLegend* >& legendList, QList< QgsComposerLabel* >& labelList, QList<const QgsComposerHtml *>& htmlFrameList ) const /*override*/ ;
@ -105,7 +105,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser
void serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const /*override*/ ;
bool useLayerIDs() const /*override*/ ;
bool useLayerIds() const /*override*/ ;
private:

2
src/analysis/openstreetmap/qgsosmbase.h
View File

@ -49,7 +49,7 @@ class ANALYSIS_EXPORT QgsOSMElement
bool isValid() const { return mElemID.type != QgsOSMElementID::Invalid; }
// fetched automatically from DB
QgsOSMElementID elemID() const { return mElemID; }
QgsOSMElementID elemId() const { return mElemID; }
QgsOSMId id() const { return mElemID.id; }
//QString username() const;
//QDateTime timestamp() const;

4
src/analysis/raster/qgsalignraster.h
View File

@ -171,9 +171,9 @@ class ANALYSIS_EXPORT QgsAlignRaster
QSizeF cellSize() const { return QSizeF( mCellSizeX, mCellSizeY ); }
//! Set the output CRS in WKT format
void setDestinationCRS( const QString& crsWkt ) { mCrsWkt = crsWkt; }
void setDestinationCrs( const QString& crsWkt ) { mCrsWkt = crsWkt; }
//! Get the output CRS in WKT format
QString destinationCRS() const { return mCrsWkt; }
QString destinationCrs() const { return mCrsWkt; }
//! Configure clipping extent (region of interest).
//! No extra clipping is done if the rectangle is null

2
src/analysis/raster/qgsrastercalculator.cpp
View File

@ -91,7 +91,7 @@ int QgsRasterCalculator::processCalculation( QProgressDialog* p )
if ( it->raster->crs() != mOutputCrs )
{
QgsRasterProjector proj;
proj.setCRS( it->raster->crs(), mOutputCrs );
proj.setCrs( it->raster->crs(), mOutputCrs );
proj.setInput( it->raster->dataProvider() );
proj.setPrecision( QgsRasterProjector::Exact );

54
src/app/composer/qgscomposer.cpp
View File

@ -683,7 +683,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
//connect with signals from QgsProject to write project files
if ( QgsProject::instance() )
{
connect( QgsProject::instance(), SIGNAL( writeProject( QDomDocument& ) ), this, SLOT( writeXML( QDomDocument& ) ) );
connect( QgsProject::instance(), SIGNAL( writeProject( QDomDocument& ) ), this, SLOT( writeXml( QDomDocument& ) ) );
}
#if defined(ANDROID)
@ -1621,9 +1621,9 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
return;
}
if ( containsWMSLayer() )
if ( containsWmsLayer() )
{
showWMSPrintingWarning();
showWmsPrintingWarning();
}
if ( containsAdvancedEffects() )
@ -1872,9 +1872,9 @@ void QgsComposer::printComposition( QgsComposer::OutputMode mode )
return;
}
if ( containsWMSLayer() )
if ( containsWmsLayer() )
{
showWMSPrintingWarning();
showWmsPrintingWarning();
}
if ( containsAdvancedEffects() )
@ -1999,9 +1999,9 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
return;
}
if ( containsWMSLayer() )
if ( containsWmsLayer() )
{
showWMSPrintingWarning();
showWmsPrintingWarning();
}
QSettings settings;
@ -2464,9 +2464,9 @@ private:
void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
{
if ( containsWMSLayer() )
if ( containsWmsLayer() )
{
showWMSPrintingWarning();
showWmsPrintingWarning();
}
QString settingsLabel = "/UI/displaySVGWarning";
@ -3105,7 +3105,7 @@ void QgsComposer::on_mActionSaveAsTemplate_triggered()
}
QDomDocument saveDocument;
templateXML( saveDocument );
templateXml( saveDocument );
if ( templateFile.write( saveDocument.toByteArray() ) == -1 )
{
@ -3449,7 +3449,7 @@ void QgsComposer::restoreWindowState()
}
}
void QgsComposer::writeXML( QDomDocument& doc )
void QgsComposer::writeXml( QDomDocument& doc )
{
QDomNodeList nl = doc.elementsByTagName( "qgis" );
@ -3463,10 +3463,10 @@ void QgsComposer::writeXML( QDomDocument& doc )
return;
}
writeXML( qgisElem, doc );
writeXml( qgisElem, doc );
}
void QgsComposer::writeXML( QDomNode& parentNode, QDomDocument& doc )
void QgsComposer::writeXml( QDomNode& parentNode, QDomDocument& doc )
{
QDomElement composerElem = doc.createElement( "Composer" );
composerElem.setAttribute( "title", mTitle );
@ -3493,26 +3493,26 @@ void QgsComposer::writeXML( QDomNode& parentNode, QDomDocument& doc )
//store composition
if ( mComposition )
{
mComposition->writeXML( composerElem, doc );
mComposition->writeXml( composerElem, doc );
}
// store atlas
mComposition->atlasComposition().writeXML( composerElem, doc );
mComposition->atlasComposition().writeXml( composerElem, doc );
}
void QgsComposer::templateXML( QDomDocument& doc )
void QgsComposer::templateXml( QDomDocument& doc )
{
writeXML( doc, doc );
writeXml( doc, doc );
}
void QgsComposer::readXML( const QDomDocument& doc )
void QgsComposer::readXml( const QDomDocument& doc )
{
QDomNodeList composerNodeList = doc.elementsByTagName( "Composer" );
if ( composerNodeList.size() < 1 )
{
return;
}
readXML( composerNodeList.at( 0 ).toElement(), doc, true );
readXml( composerNodeList.at( 0 ).toElement(), doc, true );
cleanupAfterTemplateRead();
}
@ -3530,7 +3530,7 @@ void QgsComposer::createCompositionWidget()
mGeneralDock->setWidget( compositionWidget );
}
void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument& doc, bool fromTemplate )
void QgsComposer::readXml( const QDomElement& composerElem, const QDomDocument& doc, bool fromTemplate )
{
// Set title only if reading from project file
if ( !fromTemplate )
@ -3556,7 +3556,7 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
if ( compositionNodeList.size() > 0 )
{
QDomElement compositionElem = compositionNodeList.at( 0 ).toElement();
mComposition->readXML( compositionElem, doc );
mComposition->readXml( compositionElem, doc );
}
connectViewSlots();
@ -3568,9 +3568,9 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
{
// read atlas parameters - must be done before adding items
atlasElem = composerElem.firstChildElement( "Atlas" );
mComposition->atlasComposition().readXML( atlasElem, doc );
mComposition->atlasComposition().readXml( atlasElem, doc );
mComposition->addItemsFromXML( composerElem, doc, &mMapsToRestore );
mComposition->addItemsFromXml( composerElem, doc, &mMapsToRestore );
}
//restore grid settings
@ -3598,7 +3598,7 @@ void QgsComposer::readXML( const QDomElement& composerElem, const QDomDocument&
//read atlas map parameters (for pre 2.2 templates)
//this part must be done after adding items
mComposition->atlasComposition().readXMLMapSettings( atlasElem, doc );
mComposition->atlasComposition().readXmlMapSettings( atlasElem, doc );
//set state of atlas controls
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
@ -3821,7 +3821,7 @@ void QgsComposer::setSelectionTool()
on_mActionSelectMoveItem_triggered();
}
bool QgsComposer::containsWMSLayer() const
bool QgsComposer::containsWmsLayer() const
{
QMap<QgsComposerItem*, QWidget*>::const_iterator item_it = mItemWidgetMap.constBegin();
QgsComposerItem* currentItem = nullptr;
@ -3833,7 +3833,7 @@ bool QgsComposer::containsWMSLayer() const
currentMap = dynamic_cast<QgsComposerMap *>( currentItem );
if ( currentMap )
{
if ( currentMap->containsWMSLayer() )
if ( currentMap->containsWmsLayer() )
{
return true;
}
@ -3867,7 +3867,7 @@ bool QgsComposer::containsAdvancedEffects() const
return false;
}
void QgsComposer::showWMSPrintingWarning()
void QgsComposer::showWmsPrintingWarning()
{
QString myQSettingsLabel = "/UI/displayComposerWMSWarning";
QSettings myQSettings;

14
src/app/composer/qgscomposer.h
View File

@ -432,14 +432,14 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//XML, usually connected with QgsProject::readProject and QgsProject::writeProject
//! Stores state in Dom node
void writeXML( QDomDocument& doc );
void writeXml( QDomDocument& doc );
//! Stores only template as base Dom node
void templateXML( QDomDocument& doc );
void templateXml( QDomDocument& doc );
//! Sets state from Dom document
void readXML( const QDomDocument& doc );
void readXML( const QDomElement& composerElem, const QDomDocument& doc, bool fromTemplate = false );
void readXml( const QDomDocument& doc );
void readXml( const QDomElement& composerElem, const QDomDocument& doc, bool fromTemplate = false );
void setSelectionTool();
@ -480,13 +480,13 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
void setupUndoView();
//! True if a composer map contains a WMS layer
bool containsWMSLayer() const;
bool containsWmsLayer() const;
//! True if a composer contains advanced effects, such as blend modes
bool containsAdvancedEffects() const;
//! Displays a warning because of possible min/max size in WMS
void showWMSPrintingWarning();
void showWmsPrintingWarning();
//! Displays a warning because of incompatibility between blend modes and QPrinter
void showAdvancedEffectsWarning();
@ -495,7 +495,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
void cleanupAfterTemplateRead();
//! Writes state under DOM element
void writeXML( QDomNode& parentNode, QDomDocument& doc );
void writeXml( QDomNode& parentNode, QDomDocument& doc );
//! Removes all the item from the graphics scene and deletes them
void deleteItemWidgets();

2
src/app/gps/qgsgpsinformationwidget.cpp
View File

@ -230,7 +230,7 @@ QgsGPSInformationWidget::QgsGPSInformationWidget( QgsMapCanvas * thepCanvas, QWi
radRecenterWhenNeeded->setChecked( true );
}
mWgs84CRS = QgsCRSCache::instance()->crsByOgcWmsCrs( "EPSG:4326" );
mWgs84CRS = QgsCrsCache::instance()->crsByOgcWmsCrs( "EPSG:4326" );
mBtnDebug->setVisible( mySettings.value( "/gps/showDebug", "false" ).toBool() ); // use a registry setting to control - power users/devs could set it

2
src/app/gps/qgsgpsmarker.cpp
View File

@ -26,7 +26,7 @@ QgsGpsMarker::QgsGpsMarker( QgsMapCanvas* mapCanvas )
: QgsMapCanvasItem( mapCanvas )
{
mSize = 16;
mWgs84CRS = QgsCRSCache::instance()->crsByOgcWmsCrs( "EPSG:4326" );
mWgs84CRS = QgsCrsCache::instance()->crsByOgcWmsCrs( "EPSG:4326" );
mSvg.load( QString( ":/images/north_arrows/gpsarrow2.svg" ) );
if ( ! mSvg.isValid() )
{

2
src/app/ogr/qgsvectorlayersaveasdialog.cpp
View File

@ -102,7 +102,7 @@ void QgsVectorLayerSaveAsDialog::setup()
idx = 0;
}
QgsCoordinateReferenceSystem srs = QgsCRSCache::instance()->crsBySrsId( mCRS );
QgsCoordinateReferenceSystem srs = QgsCrsCache::instance()->crsBySrsId( mCRS );
mCrsSelector->setCrs( srs );
mCrsSelector->setLayerCrs( srs );
mCrsSelector->dialog()->setMessage( tr( "Select the coordinate reference system for the vector file. "

4
src/app/openstreetmap/qgsosmdownloaddialog.cpp
View File

@ -104,7 +104,7 @@ void QgsOSMDownloadDialog::onExtentCanvas()
if ( QgisApp::instance()->mapCanvas()->hasCrsTransformEnabled() )
{
QgsCoordinateReferenceSystem dst = QgsCRSCache::instance()->crsBySrsId( GEOCRS_ID );
QgsCoordinateReferenceSystem dst = QgsCrsCache::instance()->crsBySrsId( GEOCRS_ID );
QgsCoordinateTransform ct( QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs(), dst );
r = ct.transformBoundingBox( r );
@ -143,7 +143,7 @@ void QgsOSMDownloadDialog::onCurrentLayerChanged( int index )
if ( !layer )
return;
QgsCoordinateReferenceSystem dst = QgsCRSCache::instance()->crsBySrsId( GEOCRS_ID );
QgsCoordinateReferenceSystem dst = QgsCrsCache::instance()->crsBySrsId( GEOCRS_ID );
QgsCoordinateTransform ct( layer->crs(), dst );
QgsRectangle rect( ct.transformBoundingBox( layer->extent() ) );

64
src/app/qgisapp.cpp
View File

@ -422,12 +422,12 @@ static QgsMessageOutput *messageOutputViewer_()
static void customSrsValidation_( QgsCoordinateReferenceSystem &srs )
{
QgisApp::instance()->emitCustomSrsValidation( srs );
QgisApp::instance()->emitCustomCrsValidation( srs );
}
void QgisApp::emitCustomSrsValidation( QgsCoordinateReferenceSystem &srs )
void QgisApp::emitCustomCrsValidation( QgsCoordinateReferenceSystem &srs )
{
emit customSrsValidation( srs );
emit customCrsValidation( srs );
}
void QgisApp::layerTreeViewDoubleClicked( const QModelIndex& index )
@ -500,7 +500,7 @@ void QgisApp::activeLayerChanged( QgsMapLayer* layer )
* - use project's CRS
* - use predefined global CRS
*/
void QgisApp::validateSrs( QgsCoordinateReferenceSystem &srs )
void QgisApp::validateCrs( QgsCoordinateReferenceSystem &srs )
{
static QString authid = QString::null;
QSettings mySettings;
@ -515,7 +515,7 @@ void QgisApp::validateSrs( QgsCoordinateReferenceSystem &srs )
if ( authid.isNull() )
authid = QgisApp::instance()->mapCanvas()->mapSettings().destinationCrs().authid();
QgsCoordinateReferenceSystem defaultCrs = QgsCRSCache::instance()->crsByOgcWmsCrs( authid );
QgsCoordinateReferenceSystem defaultCrs = QgsCrsCache::instance()->crsByOgcWmsCrs( authid );
if ( defaultCrs.isValid() )
{
mySelector->setSelectedCrsId( defaultCrs.srsid() );
@ -883,9 +883,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
QgsMessageLog::logMessage( tr( "QGIS starting..." ), QString::null, QgsMessageLog::INFO );
// set QGIS specific srs validation
connect( this, SIGNAL( customSrsValidation( QgsCoordinateReferenceSystem& ) ),
this, SLOT( validateSrs( QgsCoordinateReferenceSystem& ) ) );
QgsCoordinateReferenceSystem::setCustomSrsValidation( customSrsValidation_ );
connect( this, SIGNAL( customCrsValidation( QgsCoordinateReferenceSystem& ) ),
this, SLOT( validateCrs( QgsCoordinateReferenceSystem& ) ) );
QgsCoordinateReferenceSystem::setCustomCrsValidation( customSrsValidation_ );
// set graphical message output
QgsMessageOutput::setMessageOutputCreator( messageOutputViewer_ );
@ -1596,8 +1596,8 @@ void QgisApp::createActions()
connect( mActionRemoveLayer, SIGNAL( triggered() ), this, SLOT( removeLayer() ) );
connect( mActionDuplicateLayer, SIGNAL( triggered() ), this, SLOT( duplicateLayers() ) );
connect( mActionSetLayerScaleVisibility, SIGNAL( triggered() ), this, SLOT( setLayerScaleVisibility() ) );
connect( mActionSetLayerCRS, SIGNAL( triggered() ), this, SLOT( setLayerCRS() ) );
connect( mActionSetProjectCRSFromLayer, SIGNAL( triggered() ), this, SLOT( setProjectCRSFromLayer() ) );
connect( mActionSetLayerCRS, SIGNAL( triggered() ), this, SLOT( setLayerCrs() ) );
connect( mActionSetProjectCRSFromLayer, SIGNAL( triggered() ), this, SLOT( setProjectCrsFromLayer() ) );
connect( mActionLayerProperties, SIGNAL( triggered() ), this, SLOT( layerProperties() ) );
connect( mActionLayerSubsetString, SIGNAL( triggered() ), this, SLOT( layerSubsetString() ) );
connect( mActionAddToOverview, SIGNAL( triggered() ), this, SLOT( isInOverview() ) );
@ -1740,7 +1740,7 @@ void QgisApp::writeAnnotationItemsToProject( QDomDocument& doc )
{
continue;
}
item->writeXML( doc );
item->writeXml( doc );
}
}
@ -4414,7 +4414,7 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )
// set project CRS
QString defCrs = settings.value( "/Projections/projectDefaultCrs", GEO_EPSG_CRS_AUTHID ).toString();
QgsCoordinateReferenceSystem srs = QgsCRSCache::instance()->crsByOgcWmsCrs( defCrs );
QgsCoordinateReferenceSystem srs = QgsCrsCache::instance()->crsByOgcWmsCrs( defCrs );
mMapCanvas->setDestinationCrs( srs );
// write the projections _proj string_ to project settings
prj->writeEntry( "SpatialRefSys", "/ProjectCRSProj4String", srs.toProj4() );
@ -4429,7 +4429,7 @@ void QgisApp::fileNew( bool thePromptToSaveFlag, bool forceBlank )
// enable OTF CRS transformation if necessary
mMapCanvas->setCrsTransformEnabled( settings.value( "/Projections/otfTransformEnabled", 0 ).toBool() );
updateCRSStatusBar();
updateCrsStatusBar();
/** New Empty Project Created
(before attempting to load custom project templates/filepaths) */
@ -5993,7 +5993,7 @@ void QgisApp::saveAsRasterFile()
if ( d.outputCrs() != rasterLayer->crs() )
{
QgsRasterProjector * projector = new QgsRasterProjector;
projector->setCRS( rasterLayer->crs(), d.outputCrs() );
projector->setCrs( rasterLayer->crs(), d.outputCrs() );
if ( !pipe->insert( 2, projector ) )
{
QgsDebugMsg( "Cannot set pipe projector" );
@ -6012,7 +6012,7 @@ void QgisApp::saveAsRasterFile()
QgsDebugMsg( "Cannot get pipe projector" );
return;
}
projector->setCRS( rasterLayer->crs(), d.outputCrs() );
projector->setCrs( rasterLayer->crs(), d.outputCrs() );
}
if ( !pipe->last() )
@ -6172,7 +6172,7 @@ void QgisApp::saveAsVectorFileGeneral( QgsVectorLayer* vlayer, bool symbologyOpt
QgsWKBTypes::Type forcedGeometryType = dialog->geometryType();
QgsCoordinateTransform ct;
destCRS = QgsCRSCache::instance()->crsBySrsId( dialog->crs() );
destCRS = QgsCrsCache::instance()->crsBySrsId( dialog->crs() );
if ( destCRS.isValid() && destCRS != vlayer->crs() )
{
@ -6535,7 +6535,7 @@ QgsComposer* QgisApp::duplicateComposer( QgsComposer* currentComposer, QString t
// test that current composer template write is valid
QDomDocument currentDoc;
currentComposer->templateXML( currentDoc );
currentComposer->templateXml( currentDoc );
QDomElement compositionElem = currentDoc.documentElement().firstChildElement( "Composition" );
if ( compositionElem.isNull() )
{
@ -6589,7 +6589,7 @@ bool QgisApp::loadComposersFromProject( const QDomDocument& doc )
QTime t;
t.start();
QgsComposer* composer = new QgsComposer( this, tr( "Composer %1" ).arg( mLastComposerId ) );
composer->readXML( composerNodes.at( i ).toElement(), doc );
composer->readXml( composerNodes.at( i ).toElement(), doc );
mPrintComposers.insert( composer );
mPrintComposersMenu->addAction( composer->windowAction() );
#ifndef Q_OS_MACX
@ -6676,14 +6676,14 @@ bool QgisApp::loadAnnotationItemsFromProject( const QDomDocument& doc )
for ( int i = 0; i < textItemList.size(); ++i )
{
QgsTextAnnotationItem* newTextItem = new QgsTextAnnotationItem( mMapCanvas );
newTextItem->readXML( doc, textItemList.at( i ).toElement() );
newTextItem->readXml( doc, textItemList.at( i ).toElement() );
}
QDomNodeList formItemList = doc.elementsByTagName( "FormAnnotationItem" );
for ( int i = 0; i < formItemList.size(); ++i )
{
QgsFormAnnotationItem* newFormItem = new QgsFormAnnotationItem( mMapCanvas );
newFormItem->readXML( doc, formItemList.at( i ).toElement() );
newFormItem->readXml( doc, formItemList.at( i ).toElement() );
}
#ifdef WITH_QTWEBKIT
@ -6691,7 +6691,7 @@ bool QgisApp::loadAnnotationItemsFromProject( const QDomDocument& doc )
for ( int i = 0; i < htmlItemList.size(); ++i )
{
QgsHtmlAnnotationItem* newHtmlItem = new QgsHtmlAnnotationItem( mMapCanvas );
newHtmlItem->readXML( doc, htmlItemList.at( i ).toElement() );
newHtmlItem->readXml( doc, htmlItemList.at( i ).toElement() );
}
#endif
@ -6699,7 +6699,7 @@ bool QgisApp::loadAnnotationItemsFromProject( const QDomDocument& doc )
for ( int i = 0; i < svgItemList.size(); ++i )
{
QgsSvgAnnotationItem* newSvgItem = new QgsSvgAnnotationItem( mMapCanvas );
newSvgItem->readXML( doc, svgItemList.at( i ).toElement() );
newSvgItem->readXml( doc, svgItemList.at( i ).toElement() );
}
return true;
}
@ -8454,7 +8454,7 @@ void QgisApp::zoomToLayerScale()
}
}
void QgisApp::setLayerCRS()
void QgisApp::setLayerCrs()
{
if ( !( mLayerTreeView && mLayerTreeView->currentLayer() ) )
{
@ -8470,7 +8470,7 @@ void QgisApp::setLayerCRS()
return;
}
QgsCoordinateReferenceSystem crs = QgsCRSCache::instance()->crsBySrsId( mySelector.selectedCrsId() );
QgsCoordinateReferenceSystem crs = QgsCrsCache::instance()->crsBySrsId( mySelector.selectedCrsId() );
Q_FOREACH ( QgsLayerTreeNode* node, mLayerTreeView->selectedNodes() )
{
@ -8499,7 +8499,7 @@ void QgisApp::setLayerCRS()
mMapCanvas->refresh();
}
void QgisApp::setProjectCRSFromLayer()
void QgisApp::setProjectCrsFromLayer()
{
if ( !( mLayerTreeView && mLayerTreeView->currentLayer() ) )
{
@ -8608,7 +8608,7 @@ void QgisApp::applyStyleToGroup()
}
}
void QgisApp::legendGroupSetCRS()
void QgisApp::legendGroupSetCrs()
{
if ( !mMapCanvas )
{
@ -8627,7 +8627,7 @@ void QgisApp::legendGroupSetCRS()
return;
}
QgsCoordinateReferenceSystem crs = QgsCRSCache::instance()->crsBySrsId( mySelector.selectedCrsId() );
QgsCoordinateReferenceSystem crs = QgsCrsCache::instance()->crsBySrsId( mySelector.selectedCrsId() );
Q_FOREACH ( QgsLayerTreeLayer* nodeLayer, currentGroup->findLayers() )
{
if ( nodeLayer->layer() )
@ -8638,12 +8638,12 @@ void QgisApp::legendGroupSetCRS()
}
}
void QgisApp::legendGroupSetWMSData()
void QgisApp::legendGroupSetWmsData()
{
QgsLayerTreeGroup* currentGroup = mLayerTreeView->currentGroupNode();
if ( !currentGroup )
return;
QgsGroupWMSDataDialog* dlg = new QgsGroupWMSDataDialog( this );
QgsGroupWmsDataDialog* dlg = new QgsGroupWmsDataDialog( this );
dlg->setGroupShortName( currentGroup->customProperty( "wmsShortName" ).toString() );
dlg->setGroupTitle( currentGroup->customProperty( "wmsTitle" ).toString() );
dlg->setGroupTitle( currentGroup->customProperty( "wmsAbstract" ).toString() );
@ -9967,7 +9967,7 @@ void QgisApp::removeWebToolBarIcon( QAction *qAction )
mWebToolBar->removeAction( qAction );
}
void QgisApp::updateCRSStatusBar()
void QgisApp::updateCrsStatusBar()
{
mOnTheFlyProjectionStatusButton->setText( mMapCanvas->mapSettings().destinationCrs().authid() );
@ -9988,14 +9988,14 @@ void QgisApp::updateCRSStatusBar()
void QgisApp::destinationCrsChanged()
{
updateCRSStatusBar();
updateCrsStatusBar();
}
void QgisApp::hasCrsTransformEnabled( bool theFlag )
{
// save this information to project
QgsProject::instance()->writeEntry( "SpatialRefSys", "/ProjectionsEnabled", ( theFlag ? 1 : 0 ) );
updateCRSStatusBar();
updateCrsStatusBar();
}
// slot to update the progress bar in the status bar

Some files were not shown because too many files have changed in this diff Show More