Skip to content

Commit 85f3b81

Browse files
3nids3nids
committed
remove double spaces in sip files
fix indentation
1 parent 6958db6 commit 85f3b81

File tree

123 files changed

+296
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+296
-296
lines changed

‎python/core/annotations/qgsannotation.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class QgsAnnotation : QObject
5656

5757
void render( QgsRenderContext &context ) const;
5858

59-
virtual void writeXml( QDomElement &elem, QDomDocument &doc ) const = 0;
59+
virtual void writeXml( QDomElement &elem, QDomDocument &doc ) const = 0;
6060
virtual void readXml( const QDomElement &itemElem, const QDomDocument &doc ) = 0;
6161

6262
void setMarkerSymbol( QgsMarkerSymbol *symbol /Transfer/ );

‎python/core/composer/qgsatlascomposition.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public:
174174
/** Prepare the atlas map for the given feature. Sets the extent and context variables
175175
* @returns true if feature was successfully prepared
176176
*/
177-
bool prepareForFeature( const QgsFeature *feat );
177+
bool prepareForFeature( const QgsFeature *feat );
178178

179179
/** Returns the current filename. Must be called after prepareForFeature() */
180180
QString currentFilename() const;

‎python/core/composer/qgscomposerarrow.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class QgsComposerArrow: QgsComposerItem
154154
* @param elem is DOM element corresponding to 'Composer' tag
155155
* @param doc document
156156
*/
157-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
157+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
158158

159159
/** Sets state from DOM document
160160
* @param itemElem is DOM node corresponding to item tag

‎python/core/composer/qgscomposerattributetablemodelv2.sip

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class QgsComposerAttributeTableColumnModelV2: QAbstractTableModel
5454
* @note added in 2.3
5555
* @see indexFromColumn
5656
*/
57-
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;
57+
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;
5858

5959
/** Returns a QModelIndex corresponding to a QgsComposerTableColumn in the model.
6060
* @returns QModelIndex for specified QgsComposerTableColumn
@@ -80,15 +80,15 @@ class QgsComposerAttributeTableColumnModelV2: QAbstractTableModel
8080
* @note added in 2.3
8181
* @see setColumnAsSorted
8282
*/
83-
void setColumnAsUnsorted( QgsComposerTableColumn *column );
83+
void setColumnAsUnsorted( QgsComposerTableColumn *column );
8484

8585
/** Moves a column up or down in the sort rank for the QgsComposerAttributeTable.
8686
* @param column a QgsComposerTableColumn
8787
* @param direction direction to move the column in the sort rank list
8888
* @note added in 2.3
8989
* @see setColumnAsSorted
9090
*/
91-
bool moveColumnInSortRank( QgsComposerTableColumn *column, ShiftDirection direction );
91+
bool moveColumnInSortRank( QgsComposerTableColumn *column, ShiftDirection direction );
9292

9393
};
9494

@@ -140,7 +140,7 @@ class QgsComposerTableSortColumnsProxyModelV2 : QSortFilterProxyModel
140140
* @see columnFromRow
141141
* @see columnFromSourceIndex
142142
*/
143-
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;
143+
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;
144144

145145
/** Returns the QgsComposerTableColumn corresponding to an index from the source
146146
* QgsComposerAttributeTableColumnModel model.
@@ -158,6 +158,6 @@ class QgsComposerTableSortColumnsProxyModelV2 : QSortFilterProxyModel
158158
void resetFilter();
159159

160160
protected:
161-
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
161+
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
162162

163163
};

‎python/core/composer/qgscomposerattributetablev2.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
5252
* @param ignoreFrames ignore frames
5353
* @see readXML
5454
*/
55-
virtual bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const;
55+
virtual bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const;
5656

5757
/** Reads the properties specific to an attribute table from xml.
5858
* @param itemElem a QDomElement holding the attribute table's desired properties.

‎python/core/composer/qgscomposerframe.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class QgsComposerFrame: QgsComposerItem
3131
void paint( QPainter *painter, const QStyleOptionGraphicsItem *itemStyle, QWidget *pWidget );
3232
void beginItemCommand( const QString &text );
3333
void endItemCommand();
34-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
34+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
3535
bool readXml( const QDomElement &itemElem, const QDomDocument &doc );
3636
int type() const;
3737

‎python/core/composer/qgscomposerhtml.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
174174
virtual QString displayName() const;
175175
QSizeF totalSize() const;
176176
void render( QPainter *p, const QRectF &renderExtent, const int frameIndex );
177-
bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const;
177+
bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const;
178178
bool readXml( const QDomElement &itemElem, const QDomDocument &doc, bool ignoreFrames = false );
179179
void addFrame( QgsComposerFrame *frame /Transfer/, bool recalcFrameSizes = true );
180180
//overridden to break frames without dividing lines of text

‎python/core/composer/qgscomposeritem.sip

+4-4
Original file line numberDiff line numberDiff line change
@@ -593,11 +593,11 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
593593
protected:
594594

595595
//event handlers
596-
virtual void mouseMoveEvent( QGraphicsSceneMouseEvent *event );
597-
virtual void mousePressEvent( QGraphicsSceneMouseEvent *event );
598-
virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
596+
virtual void mouseMoveEvent( QGraphicsSceneMouseEvent *event );
597+
virtual void mousePressEvent( QGraphicsSceneMouseEvent *event );
598+
virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
599599

600-
virtual void hoverMoveEvent( QGraphicsSceneHoverEvent *event );
600+
virtual void hoverMoveEvent( QGraphicsSceneHoverEvent *event );
601601

602602
/** Draws additional graphics on selected items. The base implementation has
603603
* no effect.

‎python/core/composer/qgscomposeritemcommand.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,6 @@ class QgsComposerMergeCommand : QgsComposerItemCommand
119119
QgsComposerMergeCommand( Context c, QgsComposerItem *item, const QString &text );
120120
~QgsComposerMergeCommand();
121121

122-
bool mergeWith( const QUndoCommand *command );
122+
bool mergeWith( const QUndoCommand *command );
123123
int id() const;
124124
};

‎python/core/composer/qgscomposeritemgroup.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class QgsComposerItemGroup: QgsComposerItem
1616
/** Removes the items but does not delete them*/
1717
void removeItems();
1818
/** Draw outline and ev. selection handles*/
19-
void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 );
19+
void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 );
2020
/** Sets this items bound in scene coordinates such that 1 item size units
2121
corresponds to 1 scene size unit*/
2222
void setSceneRect( const QRectF &rectangle );
@@ -28,7 +28,7 @@ class QgsComposerItemGroup: QgsComposerItem
2828
* @param elem is Dom element corresponding to 'Composer' tag
2929
* @param doc is the Dom document
3030
*/
31-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
31+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
3232

3333
/** Sets state from Dom document
3434
* @param itemElem is Dom node corresponding to item tag

‎python/core/composer/qgscomposerlabel.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class QgsComposerLabel : QgsComposerItem
100100
* @param elem is Dom element corresponding to 'Composer' tag
101101
* @param doc document
102102
*/
103-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
103+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
104104

105105
/** Sets state from Dom document
106106
* @param itemElem is Dom element corresponding to 'ComposerLabel' tag

‎python/core/composer/qgscomposerlegend.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class QgsComposerLegend : QgsComposerItem
108108
void setTitleAlignment( Qt::AlignmentFlag alignment );
109109

110110
/** Returns reference to modifiable style */
111-
QgsLegendStyle &rstyle( QgsLegendStyle::Style s );
111+
QgsLegendStyle &rstyle( QgsLegendStyle::Style s );
112112
/** Returns style */
113113
QgsLegendStyle style( QgsLegendStyle::Style s ) const;
114114
void setStyle( QgsLegendStyle::Style s, const QgsLegendStyle &style );
@@ -231,7 +231,7 @@ class QgsComposerLegend : QgsComposerItem
231231
* @param elem is Dom element corresponding to 'Composer' tag
232232
* @param doc Dom document
233233
*/
234-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
234+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
235235

236236
/** Sets state from Dom document
237237
* @param itemElem is Dom node corresponding to item tag

‎python/core/composer/qgscomposermap.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class QgsComposerMap : QgsComposerItem
1919
/** Return correct graphics item type. */
2020
virtual int type() const;
2121

22-
/** \brief Preview style */
22+
/** \brief Preview style */
2323
enum PreviewMode
2424
{
2525
Cache, // Use raster cache
@@ -195,7 +195,7 @@ class QgsComposerMap : QgsComposerItem
195195
* @param elem is Dom element corresponding to 'Composer' tag
196196
* @param doc Dom document
197197
*/
198-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
198+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
199199

200200
/** Sets state from Dom document
201201
* @param itemElem is Dom node corresponding to 'ComposerMap' tag

‎python/core/composer/qgscomposermapgrid.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
257257
* @param doc DOM document
258258
* @see readXML
259259
*/
260-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
260+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
261261

262262
/** Sets grid state from a DOM document
263263
* @param itemElem is DOM node corresponding to a 'ComposerMapGrid' tag

‎python/core/composer/qgscomposermapitem.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class QgsComposerMapItem : QgsComposerObject
2828
* @param doc DOM document
2929
* @see readXML
3030
*/
31-
virtual bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
31+
virtual bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
3232

3333
/** Sets map item state from a DOM document
3434
* @param itemElem is DOM node corresponding to a 'ComposerMapGrid' tag
@@ -121,7 +121,7 @@ class QgsComposerMapItemStack
121121
* @returns true if write was successful
122122
* @see readXML
123123
*/
124-
virtual bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
124+
virtual bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
125125

126126
/** Sets the item stack's state from a DOM document
127127
* @param elem is DOM node corresponding to 'a ComposerMap' tag

‎python/core/composer/qgscomposermapoverview.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class QgsComposerMapOverview : QgsComposerMapItem
131131
* @param doc DOM document
132132
* @see readXML
133133
*/
134-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
134+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
135135

136136
/** Sets overview state from a DOM document
137137
* @param itemElem is DOM node corresponding to a 'ComposerMapOverview' tag

‎python/core/composer/qgscomposermodel.sip

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class QgsComposerModel : QAbstractItemModel
4545
int rowCount( const QModelIndex &parent = QModelIndex() ) const;
4646
int columnCount( const QModelIndex &parent = QModelIndex() ) const;
4747
QVariant data( const QModelIndex &index, int role ) const;
48-
Qt::ItemFlags flags( const QModelIndex &index ) const;
49-
bool setData( const QModelIndex &index, const QVariant &value, int role );
48+
Qt::ItemFlags flags( const QModelIndex &index ) const;
49+
bool setData( const QModelIndex &index, const QVariant &value, int role );
5050
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
5151
Qt::DropActions supportedDropActions() const;
5252
virtual QStringList mimeTypes() const;
5353
virtual QMimeData *mimeData( const QModelIndexList &indexes ) const;
5454
bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent );
55-
bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() );
55+
bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() );
5656

5757
/** Clears all items from z-order list and resets the model
5858
* @note added in QGIS 2.5
@@ -282,7 +282,7 @@ class QgsComposerProxyModel: QSortFilterProxyModel
282282
QgsComposerItem *itemFromSourceIndex( const QModelIndex &sourceIndex ) const;
283283

284284
protected:
285-
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
285+
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
286286
bool lessThan( const QModelIndex &left, const QModelIndex &right ) const;
287287

288288
};

‎python/core/composer/qgscomposermultiframe.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class QgsComposerMultiFrame: QgsComposerObject
137137
* @param ignoreFrames set to false to avoid writing state information about child frames into DOM
138138
* @see _writeXML
139139
*/
140-
virtual bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const = 0;
140+
virtual bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const = 0;
141141

142142
/** Stores state information about base multiframe object in DOM element. Implementations of writeXML
143143
* should call this method.

‎python/core/composer/qgscomposermultiframecommand.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class QgsComposerMultiFrameMergeCommand: QgsComposerMultiFrameCommand
5959
QgsComposerMultiFrameMergeCommand( Context c, QgsComposerMultiFrame *multiFrame, const QString &text );
6060
~QgsComposerMultiFrameMergeCommand();
6161

62-
bool mergeWith( const QUndoCommand *command );
62+
bool mergeWith( const QUndoCommand *command );
6363
int id() const;
6464

6565
};

‎python/core/composer/qgscomposernodesitem.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class QgsComposerNodesItem: QgsComposerItem
8080
* @param elem is Dom element corresponding to 'Composer' tag
8181
* @param doc write template file
8282
*/
83-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
83+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
8484

8585
protected:
8686

‎python/core/composer/qgscomposerobject.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class QgsComposerObject : QObject, QgsExpressionContextGenerator
9494
* @param elem is DOM element corresponding to item tag
9595
* @param doc is the DOM document
9696
*/
97-
virtual bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
97+
virtual bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
9898

9999
/** Sets item state from DOM element
100100
* @param itemElem is DOM node corresponding to item tag

‎python/core/composer/qgscomposerpicture.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class QgsComposerPicture: QgsComposerItem
7474
* @param elem is Dom element corresponding to 'Composer' tag
7575
* @param doc is Dom document
7676
*/
77-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
77+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
7878

7979
/** Sets state from Dom document
8080
* @param itemElem is Dom node corresponding to item tag

‎python/core/composer/qgscomposerscalebar.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ class QgsComposerScaleBar: QgsComposerItem
257257
* @param elem is Dom element corresponding to 'Composer' tag
258258
* @param doc Dom document
259259
*/
260-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
260+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
261261

262262
/** Sets state from Dom document
263263
* @param itemElem is Dom node corresponding to item tag

‎python/core/composer/qgscomposershape.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QgsComposerShape: QgsComposerItem
2727
* @param elem is Dom element corresponding to 'Composer' tag
2828
* @param doc write template file
2929
*/
30-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
30+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
3131

3232
/** Sets state from Dom document
3333
* @param itemElem is Dom node corresponding to item tag

‎python/core/composer/qgscomposertablecolumn.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class QgsComposerTableColumn: QObject
2121
* @note added in 2.3
2222
* @see readXML
2323
*/
24-
virtual bool writeXml( QDomElement &columnElem, QDomDocument &doc ) const;
24+
virtual bool writeXml( QDomElement &columnElem, QDomDocument &doc ) const;
2525

2626
/** Reads the column's properties from xml.
2727
* @param columnElem a QDomElement holding the column's desired properties.

‎python/core/composer/qgscomposertablev2.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class QgsComposerTableStyle
4242
* @param doc QDomDocument for the destination XML.
4343
* @see readXML
4444
*/
45-
bool writeXml( QDomElement &styleElem, QDomDocument &doc ) const;
45+
bool writeXml( QDomElement &styleElem, QDomDocument &doc ) const;
4646

4747
/** Reads the style's properties from XML.
4848
* @param styleElem a QDomElement holding the style's desired properties.
@@ -433,7 +433,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
433433
//reimplemented to return min frame height
434434
virtual QSizeF minFrameSize( const int frameIndex = -1 ) const;
435435

436-
virtual bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const;
436+
virtual bool writeXml( QDomElement &elem, QDomDocument &doc, bool ignoreFrames = false ) const;
437437
virtual bool readXml( const QDomElement &itemElem, const QDomDocument &doc, bool ignoreFrames = false );
438438
virtual QSizeF totalSize() const;
439439
virtual void render( QPainter *p, const QRectF &renderExtent, const int frameIndex );

‎python/core/composer/qgscomposition.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ class QgsComposition : QGraphicsScene, QgsExpressionContextGenerator
520520
* @returns QgsComposerModel for composition
521521
* @note this method was added in version 2.5
522522
*/
523-
QgsComposerModel *itemsModel();
523+
QgsComposerModel *itemsModel();
524524

525525
/** Set a custom property for the composition.
526526
* @param key property key. If a property with the same key already exists it will be overwritten.

‎python/core/composer/qgspaperitem.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class QgsPaperItem : QgsComposerItem
3535
* @param elem is Dom element corresponding to 'Composer' tag
3636
* @param doc Dom document
3737
*/
38-
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
38+
bool writeXml( QDomElement &elem, QDomDocument &doc ) const;
3939

4040
/** Sets state from Dom document
4141
* @param itemElem is Dom node corresponding to item tag

0 commit comments

Comments
 (0)