File tree Expand file tree Collapse file tree 2 files changed +27
-25
lines changed Expand file tree Collapse file tree 2 files changed +27
-25
lines changed Original file line number Diff line number Diff line change @@ -17,29 +17,29 @@ public:
17
17
18
18
/* Fields */
19
19
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
+ };
43
43
44
44
struct labelpoint {
45
45
QgsPoint p;
@@ -85,13 +85,13 @@ public:
85
85
* @note this will be deprecated in version 2 as it is
86
86
* badly named. Rather use attributes.
87
87
* @see labelAttributes method rather */
88
- QgsLabelAttributes *layerAttributes( void );
88
+ QgsLabelAttributes *layerAttributes( );
89
89
90
90
/** Pointer to default attributes.
91
91
* @note this replaces the to-be-deprecated layerAttributes method.
92
92
* @note introduced in QGIS 1.4
93
93
*/
94
- QgsLabelAttributes *labelAttributes( void );
94
+ QgsLabelAttributes *labelAttributes( );
95
95
96
96
//! Set label field
97
97
void setLabelField ( int attr, int fieldId );
Original file line number Diff line number Diff line change @@ -4243,6 +4243,8 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
4243
4243
composer->showMinimized ();
4244
4244
composer->zoomFull ();
4245
4245
}
4246
+
4247
+ return true ;
4246
4248
}
4247
4249
4248
4250
void QgisApp::deletePrintComposers ()
You can’t perform that action at this time.
0 commit comments