Skip to content

Commit a757935

Browse files
committed
fix build with Qt<4.8 and some doxygen warnings
1 parent 454c732 commit a757935

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

src/core/composer/qgscomposerlegend.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,6 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
232232
/**Draws a layer item and all subitems*/
233233
QSizeF drawLayerItemTitle( QgsComposerLayerItem* layerItem, QPainter* painter = 0, QPointF point = QPointF() );
234234

235-
/**Draws child items of a layer item
236-
@param p painter
237-
@param layerItem parent model item (layer)
238-
@param currentPosition in/out: current y position of legend item
239-
@param layerOpacity opacity of the corresponding map layer
240-
*/
241-
242235
Nucleon drawSymbolItem( QgsComposerLegendItem* symbolItem, QPainter* painter = 0, QPointF point = QPointF(), double labelXOffset = 0. );
243236

244237
/**Draws a symbol at the current y position and returns the new x position. Returns real symbol height, because for points,

src/core/qgsvectorfilewriter.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,17 @@ class CORE_EXPORT QgsVectorFileWriter
7070

7171
/** Write contents of vector layer to an (OGR supported) vector formt
7272
@note: this method was added in version 1.5
73-
@param newFileName QString pointer which will contain the new file name created
73+
@param layer layer to write
74+
@param fileName file name to write to
75+
@param fileEncoding encoding to use
76+
@param destCRS pointer to CRS to reproject exported geometries to
77+
@param driverName OGR driver to use
78+
@param onlySelected write only selected features of layer
79+
@param errorMessage pointer to buffer fo error message
80+
@param datasourceOptions list of OGR data source creation options
81+
@param layerOptions list of OGR layer creation options
82+
@param skipAttributeCreation only write geometries
83+
@param newFilename QString pointer which will contain the new file name created
7484
(in case it is different to fileName).
7585
*/
7686
static WriterError writeAsVectorFormat( QgsVectorLayer* layer,

src/core/symbology-ng/qgsmarkersymbollayerv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ QString QgsSvgMarkerSymbolLayerV2::symbolNameToPath( QString name )
846846
QUrl url( name );
847847
if ( url.isValid() )
848848
{
849-
if ( url.isLocalFile() )
849+
if ( url.scheme().compare( "file", Qt::CaseInsensitive ) == 0 )
850850
{
851851
// it's a url to a local file
852852
name = url.toLocalFile();

0 commit comments

Comments
 (0)