fix build with Qt<4.8 and some doxygen warnings

qgis · Nov 27, 2012 · a757935 · a757935
1 parent 454c732
commit a757935
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -232,13 +232,6 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     /**Draws a layer item and all subitems*/
     QSizeF drawLayerItemTitle( QgsComposerLayerItem* layerItem, QPainter* painter = 0, QPointF point = QPointF() );
 
-    /**Draws child items of a layer item
-       @param p painter
-       @param layerItem parent model item (layer)
-       @param currentPosition in/out: current y position of legend item
-       @param layerOpacity opacity of the corresponding map layer
-    */
-
     Nucleon drawSymbolItem( QgsComposerLegendItem* symbolItem, QPainter* painter = 0, QPointF point = QPointF(), double labelXOffset = 0. );
 
     /**Draws a symbol at the current y position and returns the new x position. Returns real symbol height, because for points,

diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -70,7 +70,17 @@ class CORE_EXPORT QgsVectorFileWriter
 
     /** Write contents of vector layer to an (OGR supported) vector formt
         @note: this method was added in version 1.5
-	@param newFileName QString pointer which will contain the new file name created
+	@param layer layer to write
+	@param fileName file name to write to
+	@param fileEncoding encoding to use
+	@param destCRS pointer to CRS to reproject exported geometries to
+	@param driverName OGR driver to use
+	@param onlySelected write only selected features of layer
+	@param errorMessage pointer to buffer fo error message
+	@param datasourceOptions list of OGR data source creation options
+	@param layerOptions list of OGR layer creation options
+	@param skipAttributeCreation only write geometries
+	@param newFilename QString pointer which will contain the new file name created
 	       (in case it is different to fileName).
 	*/
     static WriterError writeAsVectorFormat( QgsVectorLayer* layer,

diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -846,7 +846,7 @@ QString QgsSvgMarkerSymbolLayerV2::symbolNameToPath( QString name )
   QUrl url( name );
   if ( url.isValid() )
   {
-    if ( url.isLocalFile() )
+    if ( url.scheme().compare( "file", Qt::CaseInsensitive ) == 0 )
     {
       // it's a url to a local file
       name = url.toLocalFile();