From c9c12bc7f97def14fd7e969f9722e3e8b23d97b3 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 18 Aug 2015 16:59:23 +1000 Subject: [PATCH] Fix warnings --- python/core/composer/qgscomposerobject.sip | 2 +- python/core/qgspallabeling.sip | 4 ++-- src/core/composer/qgscomposerobject.h | 2 +- src/core/qgspallabeling.h | 2 +- src/gui/qgsvariableeditorwidget.cpp | 5 ++--- src/server/qgswfsserver.cpp | 6 ------ 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/python/core/composer/qgscomposerobject.sip b/python/core/composer/qgscomposerobject.sip index 05f2474be3f..7b95d949dc0 100644 --- a/python/core/composer/qgscomposerobject.sip +++ b/python/core/composer/qgscomposerobject.sip @@ -145,7 +145,7 @@ class QgsComposerObject : QObject * @param property data defined property to refresh. If property is set to * QgsComposerItem::AllProperties then all data defined properties for the item will be * refreshed. - * @context expression context for evaluating data defined expressions + * @param context expression context for evaluating data defined expressions * @note this method was added in version 2.5 */ virtual void refreshDataDefinedProperty( const DataDefinedProperty property = AllProperties, const QgsExpressionContext* context = 0 ); diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip index 7c34992ee56..8e0415e0ee0 100644 --- a/python/core/qgspallabeling.sip +++ b/python/core/qgspallabeling.sip @@ -491,7 +491,7 @@ class QgsPalLayerSettings * @param f feature to label * @param context render context. The QgsExpressionContext contained within the render context * must have already had the feature and fields sets prior to calling this method. - * @param dfxLayer dxfLayer name + * @param dxfLayer dxfLayer name */ void registerFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer ); @@ -746,7 +746,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface * @param dxfLayer dxfLayer name */ virtual void registerFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext(), QString dxfLayer = QString::null ); - + virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() ); //! called when the map is drawn and labels should be placed virtual void drawLabeling( QgsRenderContext& context ); diff --git a/src/core/composer/qgscomposerobject.h b/src/core/composer/qgscomposerobject.h index a6bbfaa011a..8e9941a5038 100644 --- a/src/core/composer/qgscomposerobject.h +++ b/src/core/composer/qgscomposerobject.h @@ -178,7 +178,7 @@ class CORE_EXPORT QgsComposerObject: public QObject * @param property data defined property to refresh. If property is set to * QgsComposerItem::AllProperties then all data defined properties for the item will be * refreshed. - * @context expression context for evaluating data defined expressions + * @param context expression context for evaluating data defined expressions * @note this method was added in version 2.5 */ virtual void refreshDataDefinedProperty( const DataDefinedProperty property = AllProperties, const QgsExpressionContext* context = 0 ); diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h index 4fec23afff8..767a9ac8f7a 100644 --- a/src/core/qgspallabeling.h +++ b/src/core/qgspallabeling.h @@ -466,7 +466,7 @@ class CORE_EXPORT QgsPalLayerSettings * @param f feature to label * @param context render context. The QgsExpressionContext contained within the render context * must have already had the feature and fields sets prior to calling this method. - * @param dfxLayer dxfLayer name + * @param dxfLayer dxfLayer name */ void registerFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer ); diff --git a/src/gui/qgsvariableeditorwidget.cpp b/src/gui/qgsvariableeditorwidget.cpp index b3a61bbfedd..4afb63ab30f 100644 --- a/src/gui/qgsvariableeditorwidget.cpp +++ b/src/gui/qgsvariableeditorwidget.cpp @@ -54,9 +54,6 @@ class VariableEditorDelegate : public QItemDelegate QIcon QgsVariableEditorTree::mExpandIcon; -/// @endcond - - // // QgsVariableEditorWidget // @@ -754,3 +751,5 @@ void VariableEditorDelegate::setModelData( QWidget* widget, QAbstractItemModel * } mParentTree->refreshTree(); } + +/// @endcond diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp index 83e590da19a..bc48ace53be 100644 --- a/src/server/qgswfsserver.cpp +++ b/src/server/qgswfsserver.cpp @@ -468,9 +468,6 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format } QgsFeature feature; - QgsAttributeMap featureAttributes; - //const QgsFields& fields = provider->fields(); - const QgsFields& fields = layer->pendingFields(); mWithGeom = true; //QgsAttributeList attrIndexes = provider->attributeIndexes(); @@ -821,9 +818,6 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format } QgsFeature feature; - QgsAttributeMap featureAttributes; - //const QgsFields& fields = provider->fields(); - const QgsFields& fields = layer->pendingFields(); //map extent searchRect = layer->extent();