Skip to content

Commit f9ffdc1

Browse files
author
jef
committedNov 1, 2009
fix SIP build error and a warning
git-svn-id: http://svn.osgeo.org/qgis/trunk@11878 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 5dca02a commit f9ffdc1

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed
 

‎python/core/qgslabel.sip

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@ public:
1717

1818
/* Fields */
1919
enum LabelField {
20-
Text = 0,
21-
Family,
22-
Size,
23-
Bold,
24-
Italic,
25-
Underline,
26-
Color,
27-
XCoordinate,
28-
YCoordinate,
29-
XOffset,
30-
YOffset,
31-
Angle,
32-
Alignment,
33-
BufferEnabled,
34-
BufferSize,
35-
BufferColor,
36-
BufferBrush,
37-
BorderWidth,
38-
BorderColor,
39-
BorderStyle,
40-
MultilineEnabled,
41-
LabelFieldCount
42-
};
20+
Text = 0,
21+
Family,
22+
Size,
23+
Bold,
24+
Italic,
25+
Underline,
26+
Color,
27+
XCoordinate,
28+
YCoordinate,
29+
XOffset,
30+
YOffset,
31+
Angle,
32+
Alignment,
33+
BufferEnabled,
34+
BufferSize,
35+
BufferColor,
36+
BufferBrush,
37+
BorderWidth,
38+
BorderColor,
39+
BorderStyle,
40+
MultilineEnabled,
41+
LabelFieldCount
42+
};
4343

4444
struct labelpoint {
4545
QgsPoint p;
@@ -85,13 +85,13 @@ public:
8585
* @note this will be deprecated in version 2 as it is
8686
* badly named. Rather use attributes.
8787
* @see labelAttributes method rather */
88-
QgsLabelAttributes *layerAttributes( void );
88+
QgsLabelAttributes *layerAttributes( );
8989

9090
/** Pointer to default attributes.
9191
* @note this replaces the to-be-deprecated layerAttributes method.
9292
* @note introduced in QGIS 1.4
9393
*/
94-
QgsLabelAttributes *labelAttributes( void );
94+
QgsLabelAttributes *labelAttributes( );
9595

9696
//! Set label field
9797
void setLabelField ( int attr, int fieldId );

‎src/app/qgisapp.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4243,6 +4243,8 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
42434243
composer->showMinimized();
42444244
composer->zoomFull();
42454245
}
4246+
4247+
return true;
42464248
}
42474249

42484250
void QgisApp::deletePrintComposers()

0 commit comments

Comments
 (0)
Please sign in to comment.