Skip to content

Commit a57066a

Browse files
jef-njef-n
committedNov 20, 2014
* fix cppcheck warnings
* some sip updates * [API] fix spelling QgsMultiRenderChecker::drawBackround * [API] fix spelling QgsSymbolLayerV2Utils::drawStippledBackround * [API] fix spelling QgsMapSettings::layerTransfrom
·
ltr-3_40archive/master_2
1 parent d897aa5 commit a57066a

File tree

91 files changed

+412
-300
lines changed

Some content is hidden

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

91 files changed

+412
-300
lines changed
 

‎python/core/composer/qgscomposertablev2.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
2727

2828
public:
2929

30-
/*! Controls how headers are horizontally aligned in a table
30+
/*! Controls how headers are horizontally aligned in a table
3131
*/
3232
enum HeaderHAlignment
3333
{
@@ -318,7 +318,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
318318

319319
protected:
320320

321-
/**Calculates the maximum width of text shown in columns.
321+
/**Calculates the maximum width of text shown in columns.
322322
*/
323323
virtual bool calculateMaxColumnWidths();
324324

@@ -355,7 +355,7 @@ class QgsComposerTableV2: QgsComposerMultiFrame
355355
* @param frameIndex index number for frame
356356
* @returns row range
357357
*/
358-
QPair<int, int> rowRange( const QRectF extent, const int frameIndex ) const;
358+
QPair<int, int> rowRange( const QRectF &extent, const int frameIndex ) const;
359359

360360
/**Draws the horizontal grid lines for the table.
361361
* @param painter destination painter for grid lines

‎python/core/qgscolorscheme.sip

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class QgsColorScheme
5252
* to colors related to the base color.
5353
* @returns a list of QPairs of color and color name
5454
*/
55-
virtual QgsNamedColorList fetchColors( const QString context = QString(),
56-
const QColor baseColor = QColor() ) = 0;
55+
virtual QgsNamedColorList fetchColors( const QString &context = QString(),
56+
const QColor &baseColor = QColor() ) = 0;
5757

5858
/**Returns whether the color scheme is editable
5959
* @returns true if scheme is editable
@@ -68,7 +68,7 @@ class QgsColorScheme
6868
* @returns true if colors were set successfully
6969
* @see isEditable
7070
*/
71-
virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );
71+
virtual bool setColors( const QgsNamedColorList &colors, const QString &context = QString(), const QColor &baseColor = QColor() );
7272

7373
/**Clones a color scheme
7474
* @returns copy of color scheme
@@ -97,10 +97,10 @@ class QgsGplColorScheme : QgsColorScheme
9797

9898
virtual ~QgsGplColorScheme();
9999

100-
virtual QgsNamedColorList fetchColors( const QString context = QString(),
101-
const QColor baseColor = QColor() );
100+
virtual QgsNamedColorList fetchColors( const QString &context = QString(),
101+
const QColor &baseColor = QColor() );
102102

103-
virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );
103+
virtual bool setColors( const QgsNamedColorList &colors, const QString &context = QString(), const QColor &baseColor = QColor() );
104104

105105
protected:
106106

@@ -117,7 +117,7 @@ class QgsGplColorScheme : QgsColorScheme
117117
* subfolder off the user's QGIS settings folder.
118118
* \note Added in version 2.5
119119
*/
120-
class QgsUserColorScheme : QgsGplColorScheme
120+
class QgsUserColorScheme : QgsGplColorScheme
121121
{
122122
%TypeHeaderCode
123123
#include <qgscolorscheme.h>
@@ -128,7 +128,7 @@ class QgsUserColorScheme : QgsGplColorScheme
128128
/**Constructs a new user color scheme, using a specified gpl palette file
129129
* @param filename filename of gpl palette file stored in the users "palettes" folder
130130
*/
131-
QgsUserColorScheme( const QString filename );
131+
QgsUserColorScheme( const QString &filename );
132132

133133
virtual ~QgsUserColorScheme();
134134

@@ -141,7 +141,7 @@ class QgsUserColorScheme : QgsGplColorScheme
141141
/**Sets the name for the scheme
142142
* @param name new name
143143
*/
144-
void setName( const QString name );
144+
void setName( const QString &name );
145145

146146
/**Erases the associated gpl palette file from the users "palettes" folder
147147
* @returns true if erase was successful
@@ -175,8 +175,8 @@ class QgsRecentColorScheme : QgsColorScheme
175175

176176
virtual SchemeFlags flags() const;
177177

178-
virtual QgsNamedColorList fetchColors( const QString context = QString(),
179-
const QColor baseColor = QColor() );
178+
virtual QgsNamedColorList fetchColors( const QString &context = QString(),
179+
const QColor &baseColor = QColor() );
180180

181181
QgsColorScheme* clone() const /Factory/;
182182
}; // class QgsRecentColorScheme
@@ -202,12 +202,12 @@ class QgsCustomColorScheme : QgsColorScheme
202202

203203
virtual SchemeFlags flags() const;
204204

205-
virtual QgsNamedColorList fetchColors( const QString context = QString(),
206-
const QColor baseColor = QColor() );
205+
virtual QgsNamedColorList fetchColors( const QString &context = QString(),
206+
const QColor &baseColor = QColor() );
207207

208208
virtual bool isEditable() const;
209209

210-
virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );
210+
virtual bool setColors( const QgsNamedColorList &colors, const QString &context = QString(), const QColor &baseColor = QColor() );
211211

212212
QgsColorScheme* clone() const /Factory/;
213213
}; // class QgsCustomColorScheme
@@ -232,12 +232,12 @@ class QgsProjectColorScheme : QgsColorScheme
232232

233233
virtual SchemeFlags flags() const;
234234

235-
virtual QgsNamedColorList fetchColors( const QString context = QString(),
236-
const QColor baseColor = QColor() );
235+
virtual QgsNamedColorList fetchColors( const QString &context = QString(),
236+
const QColor &baseColor = QColor() );
237237

238238
virtual bool isEditable() const;
239239

240-
virtual bool setColors( const QgsNamedColorList colors, const QString context = QString(), const QColor baseColor = QColor() );
240+
virtual bool setColors( const QgsNamedColorList &colors, const QString &context = QString(), const QColor &baseColor = QColor() );
241241

242242
QgsColorScheme* clone() const /Factory/;
243243
}; // class QgsProjectColorScheme

0 commit comments

Comments
 (0)
Please sign in to comment.