fix SIP build error and a warning

jef · jef · commit f9ffdc1c4c56 · 2009-11-01T16:32:39.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11878 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/python/core/qgslabel.sip b/python/core/qgslabel.sip
@@ -17,29 +17,29 @@ public:
 
     /* Fields */
     enum LabelField {
-  Text = 0,
-  Family,
-  Size,
-  Bold,
-  Italic,
-  Underline,
-  Color,
-  XCoordinate,
-  YCoordinate,
-  XOffset,
-  YOffset,
-  Angle,
-  Alignment,
-  BufferEnabled,
-  BufferSize,
-  BufferColor,
-  BufferBrush,
-  BorderWidth,
-  BorderColor,
-  BorderStyle,
-  MultilineEnabled,
-  LabelFieldCount
-};
+      Text = 0,
+      Family,
+      Size,
+      Bold,
+      Italic,
+      Underline,
+      Color,
+      XCoordinate,
+      YCoordinate,
+      XOffset,
+      YOffset,
+      Angle,
+      Alignment,
+      BufferEnabled,
+      BufferSize,
+      BufferColor,
+      BufferBrush,
+      BorderWidth,
+      BorderColor,
+      BorderStyle,
+      MultilineEnabled,
+      LabelFieldCount
+    };
 
     struct labelpoint {
       QgsPoint p;
@@ -85,13 +85,13 @@ public:
      * @note this will be deprecated in version 2 as it is 
      * badly named. Rather use attributes.
      * @see labelAttributes method rather */
-    QgsLabelAttributes *layerAttributes( void );
+    QgsLabelAttributes *layerAttributes( );
 
     /** Pointer to default attributes.
      * @note this replaces the to-be-deprecated layerAttributes method.
      * @note introduced in QGIS 1.4
      */
-    QgsLabelAttributes *labelAttributes( void );
+    QgsLabelAttributes *labelAttributes( );
 
     //! Set label field
     void setLabelField ( int attr, int fieldId );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4243,6 +4243,8 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
     composer->showMinimized();
     composer->zoomFull();
   }
+
+  return true;
 }
 
 void QgisApp::deletePrintComposers()

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()`