Skip to content

Commit 07165ea

Browse files
committed
indentation update
1 parent 346b50e commit 07165ea

25 files changed

+935
-711
lines changed

doc/TRANSLATORS

+58-58
Large diffs are not rendered by default.

i18n/qgis_de.ts

+409-297
Large diffs are not rendered by default.

i18n/qgis_en.ts

+409-297
Large diffs are not rendered by default.

python/core/composer/qgsatlascomposition.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public:
188188
const QString& currentFilename() const;
189189

190190
void writeXML( QDomElement& elem, QDomDocument& doc ) const;
191-
191+
192192
/**Reads general atlas settings from xml
193193
* @param elem a QDomElement holding the atlas properties.
194194
* @param doc QDomDocument for the source xml.

python/core/composer/qgscomposerframe.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QgsComposerFrame: QgsComposerItem
2323
int type() const;
2424

2525
QgsComposerMultiFrame* multiFrame() const;
26-
26+
2727
//Overriden to allow multiframe to set display name
2828
virtual QString displayName() const;
2929
};

python/core/composer/qgscomposerhtml.sip

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ class QgsComposerHtml: QgsComposerMultiFrame
55
%End
66

77
public:
8-
8+
99
/** Source modes for the HTML content to render in the item
1010
*/
1111
enum ContentMode
1212
{
1313
Url, /*< Using this mode item fetches its content via a url*/
1414
ManualHtml /*< HTML content is manually set for the item*/
1515
};
16-
16+
1717
QgsComposerHtml( QgsComposition* c, bool createUndoCommands );
1818
QgsComposerHtml();
1919
~QgsComposerHtml();
@@ -73,7 +73,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
7373
* @note added in 2.5
7474
*/
7575
QString html() const;
76-
76+
7777
/**Returns whether html item will evaluate QGIS expressions prior to rendering
7878
* the HTML content. If set, any content inside [% %] tags will be
7979
* treated as a QGIS expression and evaluated against the current atlas
@@ -92,7 +92,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
9292
* @see evaluateExpressions
9393
* @note added in QGIS 2.5
9494
*/
95-
void setEvaluateExpressions( bool evaluateExpressions );
95+
void setEvaluateExpressions( bool evaluateExpressions );
9696

9797
QSizeF totalSize() const;
9898
void render( QPainter* p, const QRectF& renderExtent );
@@ -144,7 +144,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
144144
* @see useSmartBreaks
145145
*/
146146
double maxBreakDistance() const;
147-
147+
148148
/**Sets the user stylesheet CSS rules to use while rendering the HTML content. These
149149
* allow for overriding the styles specified within the HTML source. Setting the stylesheet
150150
* using this function does not automatically refresh the item's contents. Call loadHtml
@@ -181,7 +181,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
181181
* @note added in 2.5
182182
*/
183183
bool userStylesheetEnabled() const;
184-
184+
185185
virtual QString displayName() const;
186186

187187
public slots:
@@ -191,9 +191,9 @@ class QgsComposerHtml: QgsComposerMultiFrame
191191
* @see url
192192
*/
193193
void loadHtml();
194-
194+
195195
void refreshExpressionContext();
196-
196+
197197
virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties );
198198

199199
};

python/core/composer/qgscomposeritem.sip

+10-10
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
452452
* @deprecated use QgsComposerUtils::fontDescentMM instead
453453
*/
454454
double fontDescentMillimeters( const QFont& font ) const /Deprecated/;
455-
455+
456456
/**Returns the font height in Millimeters (considers upscaling and downscaling with FONT_WORKAROUND_SCALE.
457457
* Font height equals the font ascent+descent+1 (for baseline).
458458
* @note Added in version 2.4
@@ -525,7 +525,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
525525
* @see setId
526526
*/
527527
QString uuid() const;
528-
528+
529529
/**Get item display name. This is the item's id if set, and if
530530
* not, a user-friendly string identifying item type.
531531
* @returns display name for item
@@ -534,16 +534,16 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
534534
* @note added in version 2.5
535535
*/
536536
virtual QString displayName() const;
537-
537+
538538
/**Sets visibility for item.
539539
* @param visible set to true to show item, false to hide item
540540
* @note QGraphicsItem::setVisible should not be called directly
541541
* on a QgsComposerItem, as some item types (eg groups) need to override
542542
* the visibility toggle.
543543
* @note added in version 2.5
544544
*/
545-
virtual void setVisibility( const bool visible );
546-
545+
virtual void setVisibility( const bool visible );
546+
547547
/**Returns whether this item is part of a group
548548
* @returns true if item is in a group
549549
* @note added in version 2.5
@@ -643,7 +643,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
643643
* @deprecated will be removed in QGIS 3.0
644644
*/
645645
bool imageSizeConsideringRotation( double& width, double& height, double rotation ) const /Deprecated/;
646-
646+
647647
/**Calculates width and hight of the picture (in mm) such that it fits into the item frame with the given rotation
648648
* @deprecated will be removed in QGIS 3.0
649649
*/
@@ -662,7 +662,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
662662
* @deprecated will be removed in QGIS 3.0
663663
*/
664664
bool cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height, double rotation ) const /Deprecated/;
665-
665+
666666
/**Calculates corner point after rotation and scaling
667667
* @deprecated will be removed in QGIS 3.0
668668
*/
@@ -672,19 +672,19 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
672672
* @deprecated will be removed in QGIS 3.0
673673
*/
674674
void sizeChangedByRotation( double& width, double& height, double rotation ) /Deprecated/;
675-
675+
676676
/**Calculates width / height of the bounding box of a rotated rectangle
677677
* @deprecated will be removed in QGIS 3.0
678678
*/
679679
void sizeChangedByRotation( double& width, double& height ) /Deprecated/;
680-
680+
681681
/**Rotates a point / vector
682682
* @param angle rotation angle in degrees, counterclockwise
683683
* @param x in/out: x coordinate before / after the rotation
684684
* @param y in/out: y cooreinate before / after the rotation
685685
* @deprecated use QgsComposerUtils:rotate instead
686686
*/
687-
void rotate( double angle, double& x, double& y ) const /Deprecated/;
687+
void rotate( double angle, double& x, double& y ) const /Deprecated/;
688688

689689
/**Return horizontal align snap item. Creates a new graphics line if 0*/
690690
QGraphicsLineItem* hAlignSnapItem();

python/core/composer/qgscomposeritemgroup.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class QgsComposerItemGroup: QgsComposerItem
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 );
23-
23+
2424
//overridden to also hide grouped items
2525
virtual void setVisibility( const bool visible );
2626

python/core/composer/qgscomposerlabel.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class QgsComposerLabel : QgsComposerItem
7575
* @param doc document
7676
*/
7777
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
78-
78+
7979
//Overriden to contain part of label's text
8080
virtual QString displayName() const;
8181

python/core/composer/qgscomposermap.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ class QgsComposerMap : QgsComposerItem
494494
* @see currentMapExtent
495495
*/
496496
QPolygonF visibleExtentPolygon() const;
497-
497+
498498
//overriden to show "Map 1" type names
499499
virtual QString displayName() const;
500500

python/core/composer/qgscomposermodel.sip

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
* stacking of items in the composition to the last known state, and emit the corresponding signals
1616
* as required.
1717
*/
18-
18+
1919
class QgsComposerModel : QAbstractItemModel
2020
{
2121
%TypeHeaderCode
2222
#include "qgscomposermodel.h"
2323
%End
2424
public:
25-
25+
2626
/**Constructor
2727
* @param composition parent composition
2828
*/
@@ -185,7 +185,7 @@ class QgsComposerModel : QAbstractItemModel
185185
void updateItemVisibility( QgsComposerItem *item );
186186

187187
public slots:
188-
188+
189189
/**Sets an item as the current selection from a QModelIndex
190190
* @param index QModelIndex of item to set as selected
191191
* @note added in QGIS 2.5

python/core/composer/qgscomposermultiframe.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class QgsComposerMultiFrame: QgsComposerObject
7272
* @note added in version 2.5
7373
*/
7474
virtual QString displayName() const;
75-
75+
7676
public slots:
7777

7878
/**Recalculates the portion of the multiframe item which is shown in each of it's
@@ -90,7 +90,7 @@ class QgsComposerMultiFrame: QgsComposerObject
9090

9191
signals:
9292
void changed();
93-
93+
9494
/**Emitted when the contents of the multi frame have changed and the frames
9595
* must be redrawn.
9696
*/

python/core/composer/qgscomposermultiframecommand.sip

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ class QgsComposerMultiFrameCommand : QUndoCommand
1212

1313
void savePreviousState();
1414
void saveAfterState();
15-
15+
1616
QDomDocument previousState() const;
1717
QDomDocument afterState() const;
1818

1919
/**Returns true if previous state and after state are valid and different*/
2020
bool containsChange() const;
21-
21+
2222
const QgsComposerMultiFrame* multiFrame() const;
23-
23+
2424
protected:
2525

2626
QgsComposerMultiFrameCommand(); //forbidden

python/core/composer/qgscomposerpicture.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ class QgsComposerPicture: QgsComposerItem
161161
* instead
162162
*/
163163
bool imageSizeConsideringRotation( double& width, double& height ) const /Deprecated/;
164-
164+
165165
/**Calculates corner point after rotation and scaling
166166
* @deprecated Use QgsComposerItem::cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height, double rotation )
167167
* instead
168168
*/
169169
bool cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height ) const /Deprecated/;
170-
170+
171171
/**Calculates width / height of the bounding box of a rotated rectangle
172172
* @deprecated Use QgsComposerItem::sizeChangedByRotation( double& width, double& height, double rotation )
173173
* instead

python/core/composer/qgscomposershape.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class QgsComposerShape: QgsComposerItem
6464
* QgsComposerItem as it needs to call updateBoundingRect after the shape's size changes
6565
*/
6666
void setSceneRect( const QRectF& rectangle );
67-
67+
6868
//Overriden to return shape type
6969
virtual QString displayName() const;
7070

python/core/composer/qgscomposerutils.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class QgsComposerUtils
3333
* @param y in/out: y cooreinate before / after the rotation
3434
*/
3535
static void rotate( const double angle, double& x, double& y );
36-
36+
3737
/**Ensures that an angle is in the range 0 <= angle < 360
3838
* @param angle angle in degrees
3939
* @returns equivalent angle within the range [0, 360)

python/core/layertree/qgslayertreenode.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ class QgsLayerTreeNode : QObject
118118
protected:
119119

120120
QgsLayerTreeNode( NodeType t );
121-
121+
122122
private:
123123
QgsLayerTreeNode( const QgsLayerTreeNode& other );
124124

python/core/qgscolorscheme.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class QgsColorScheme
5454
* @see isEditable
5555
*/
5656
virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );
57-
57+
5858
/**Clones a color scheme
5959
* @returns copy of color scheme
6060
*/
@@ -108,7 +108,7 @@ class QgsCustomColorScheme : QgsColorScheme
108108

109109
virtual QgsNamedColorList fetchColors( const QString context = QString(),
110110
const QColor baseColor = QColor() );
111-
111+
112112
virtual bool isEditable() const;
113113

114114
virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );

python/core/qgsmaplayerlegend.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class QgsLayerTreeModelLegendNode : QObject
1313
%TypeHeaderCode
1414
#include <qgsmaplayerlegend.h>
1515
%End
16-
16+
1717
public:
1818

1919
/** Return pointer to the parent layer node */
@@ -82,7 +82,7 @@ class QgsMapLayerLegend : QObject
8282
%TypeHeaderCode
8383
#include <qgsmaplayerlegend.h>
8484
%End
85-
85+
8686
public:
8787
explicit QgsMapLayerLegend( QObject *parent /TransferThis/ = 0 );
8888

python/core/symbology-ng/qgssymbollayerv2utils.sip

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class QgsSymbolLayerV2Utils
5959

6060
static QString encodeScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod );
6161
static QgsSymbolV2::ScaleMethod decodeScaleMethod( QString str );
62-
62+
6363
static QPainter::CompositionMode decodeBlendMode( const QString& s );
6464

6565
static QIcon symbolPreviewIcon( QgsSymbolV2* symbol, QSize size );
@@ -199,7 +199,7 @@ class QgsSymbolLayerV2Utils
199199
* @note added in 2.5
200200
*/
201201
static QList< QColor > parseColorList( const QString colorStr );
202-
202+
203203
/**
204204
* Attempts to parse mime data as a list of named colors
205205
* @param data mime data to parse
@@ -216,7 +216,7 @@ class QgsSymbolLayerV2Utils
216216
* @note added in 2.5
217217
*/
218218
static QMimeData* colorListToMimeData( const QgsNamedColorList colorList, const bool allFormats = true );
219-
219+
220220
/**
221221
* Exports colors to a gpl GIMP palette file
222222
* @param file destination file
@@ -235,7 +235,7 @@ class QgsSymbolLayerV2Utils
235235
* @see saveColorsToGpl
236236
*/
237237
static QgsNamedColorList importColorsFromGpl( QFile &file, bool &ok );
238-
238+
239239
/**
240240
* Attempts to parse a string as a color using a variety of common formats, including hex
241241
* codes, rgb and rgba strings.

0 commit comments

Comments
 (0)