Skip to content
Permalink
Browse files

Fix warnings

  • Loading branch information
nyalldawson committed Aug 22, 2015
1 parent 2edc85c commit c9c12bc7f97def14fd7e969f9722e3e8b23d97b3
@@ -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 );
@@ -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 );
@@ -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 );
@@ -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 );

@@ -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
@@ -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();

0 comments on commit c9c12bc

Please sign in to comment.
You can’t perform that action at this time.