Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove double spaces in sip files
fix indentation
  • Loading branch information
3nids committed May 3, 2017
1 parent 6958db6 commit 85f3b81
Show file tree
Hide file tree
Showing 123 changed files with 296 additions and 296 deletions.
2 changes: 1 addition & 1 deletion python/core/annotations/qgsannotation.sip
Expand Up @@ -56,7 +56,7 @@ class QgsAnnotation : QObject

void render( QgsRenderContext &context ) const;

virtual void writeXml( QDomElement &elem, QDomDocument &doc ) const = 0;
virtual void writeXml( QDomElement &elem, QDomDocument &doc ) const = 0;
virtual void readXml( const QDomElement &itemElem, const QDomDocument &doc ) = 0;

void setMarkerSymbol( QgsMarkerSymbol *symbol /Transfer/ );
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgsatlascomposition.sip
Expand Up @@ -174,7 +174,7 @@ public:
/** Prepare the atlas map for the given feature. Sets the extent and context variables
* @returns true if feature was successfully prepared
*/
bool prepareForFeature( const QgsFeature *feat );
bool prepareForFeature( const QgsFeature *feat );

/** Returns the current filename. Must be called after prepareForFeature() */
QString currentFilename() const;
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerarrow.sip
Expand Up @@ -154,7 +154,7 @@ 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
Expand Down
10 changes: 5 additions & 5 deletions python/core/composer/qgscomposerattributetablemodelv2.sip
Expand Up @@ -54,7 +54,7 @@ class QgsComposerAttributeTableColumnModelV2: QAbstractTableModel
* @note added in 2.3
* @see indexFromColumn
*/
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;

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

/** Moves a column up or down in the sort rank for the QgsComposerAttributeTable.
* @param column a QgsComposerTableColumn
* @param direction direction to move the column in the sort rank list
* @note added in 2.3
* @see setColumnAsSorted
*/
bool moveColumnInSortRank( QgsComposerTableColumn *column, ShiftDirection direction );
bool moveColumnInSortRank( QgsComposerTableColumn *column, ShiftDirection direction );

};

Expand Down Expand Up @@ -140,7 +140,7 @@ class QgsComposerTableSortColumnsProxyModelV2 : QSortFilterProxyModel
* @see columnFromRow
* @see columnFromSourceIndex
*/
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;
QgsComposerTableColumn *columnFromIndex( const QModelIndex &index ) const;

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

protected:
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;

};
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerattributetablev2.sip
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerframe.sip
Expand Up @@ -31,7 +31,7 @@ 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 writeXml( QDomElement &elem, QDomDocument &doc ) const;
bool readXml( const QDomElement &itemElem, const QDomDocument &doc );
int type() const;

Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerhtml.sip
Expand Up @@ -174,7 +174,7 @@ 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 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
Expand Down
8 changes: 4 additions & 4 deletions python/core/composer/qgscomposeritem.sip
Expand Up @@ -593,11 +593,11 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
protected:

//event handlers
virtual void mouseMoveEvent( QGraphicsSceneMouseEvent *event );
virtual void mousePressEvent( QGraphicsSceneMouseEvent *event );
virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
virtual void mouseMoveEvent( QGraphicsSceneMouseEvent *event );
virtual void mousePressEvent( QGraphicsSceneMouseEvent *event );
virtual void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );

virtual void hoverMoveEvent( QGraphicsSceneHoverEvent *event );
virtual void hoverMoveEvent( QGraphicsSceneHoverEvent *event );

/** Draws additional graphics on selected items. The base implementation has
* no effect.
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposeritemcommand.sip
Expand Up @@ -119,6 +119,6 @@ class QgsComposerMergeCommand : QgsComposerItemCommand
QgsComposerMergeCommand( Context c, QgsComposerItem *item, const QString &text );
~QgsComposerMergeCommand();

bool mergeWith( const QUndoCommand *command );
bool mergeWith( const QUndoCommand *command );
int id() const;
};
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposeritemgroup.sip
Expand Up @@ -16,7 +16,7 @@ class QgsComposerItemGroup: QgsComposerItem
/** Removes the items but does not delete them*/
void removeItems();
/** Draw outline and ev. selection handles*/
void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 );
void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 );
/** Sets this items bound in scene coordinates such that 1 item size units
corresponds to 1 scene size unit*/
void setSceneRect( const QRectF &rectangle );
Expand All @@ -28,7 +28,7 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerlabel.sip
Expand Up @@ -100,7 +100,7 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposerlegend.sip
Expand Up @@ -108,7 +108,7 @@ class QgsComposerLegend : QgsComposerItem
void setTitleAlignment( Qt::AlignmentFlag alignment );

/** Returns reference to modifiable style */
QgsLegendStyle &rstyle( QgsLegendStyle::Style s );
QgsLegendStyle &rstyle( QgsLegendStyle::Style s );
/** Returns style */
QgsLegendStyle style( QgsLegendStyle::Style s ) const;
void setStyle( QgsLegendStyle::Style s, const QgsLegendStyle &style );
Expand Down Expand Up @@ -231,7 +231,7 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposermap.sip
Expand Up @@ -19,7 +19,7 @@ class QgsComposerMap : QgsComposerItem
/** Return correct graphics item type. */
virtual int type() const;

/** \brief Preview style */
/** \brief Preview style */
enum PreviewMode
{
Cache, // Use raster cache
Expand Down Expand Up @@ -195,7 +195,7 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposermapgrid.sip
Expand Up @@ -257,7 +257,7 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposermapitem.sip
Expand Up @@ -28,7 +28,7 @@ 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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposermapoverview.sip
Expand Up @@ -131,7 +131,7 @@ 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
Expand Down
8 changes: 4 additions & 4 deletions python/core/composer/qgscomposermodel.sip
Expand Up @@ -45,14 +45,14 @@ class QgsComposerModel : QAbstractItemModel
int rowCount( const QModelIndex &parent = QModelIndex() ) const;
int columnCount( const QModelIndex &parent = QModelIndex() ) const;
QVariant data( const QModelIndex &index, int role ) const;
Qt::ItemFlags flags( const QModelIndex &index ) const;
bool setData( const QModelIndex &index, const QVariant &value, int role );
Qt::ItemFlags flags( const QModelIndex &index ) const;
bool setData( const QModelIndex &index, const QVariant &value, int role );
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
Qt::DropActions supportedDropActions() const;
virtual QStringList mimeTypes() const;
virtual QMimeData *mimeData( const QModelIndexList &indexes ) const;
bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent );
bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() );
bool removeRows( int row, int count, const QModelIndex &parent = QModelIndex() );

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

protected:
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const;
bool lessThan( const QModelIndex &left, const QModelIndex &right ) const;

};
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposermultiframe.sip
Expand Up @@ -137,7 +137,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.
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposermultiframecommand.sip
Expand Up @@ -59,7 +59,7 @@ class QgsComposerMultiFrameMergeCommand: QgsComposerMultiFrameCommand
QgsComposerMultiFrameMergeCommand( Context c, QgsComposerMultiFrame *multiFrame, const QString &text );
~QgsComposerMultiFrameMergeCommand();

bool mergeWith( const QUndoCommand *command );
bool mergeWith( const QUndoCommand *command );
int id() const;

};
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposernodesitem.sip
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerobject.sip
Expand Up @@ -94,7 +94,7 @@ class QgsComposerObject : QObject, QgsExpressionContextGenerator
* @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
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerpicture.sip
Expand Up @@ -74,7 +74,7 @@ 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
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerscalebar.sip
Expand Up @@ -257,7 +257,7 @@ 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