sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Nyall Dawson 2015-08-18 16:59:23 +10:00
parent 2edc85c086
commit c9c12bc7f9
6 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/composer/qgscomposerobject.sip
View File

@ -145,7 +145,7 @@ class QgsComposerObject : QObject
* @param property data defined property to refresh. If property is set to * @param property data defined property to refresh. If property is set to
* QgsComposerItem::AllProperties then all data defined properties for the item will be * QgsComposerItem::AllProperties then all data defined properties for the item will be
* refreshed. * 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 * @note this method was added in version 2.5
*/ */
virtual void refreshDataDefinedProperty( const DataDefinedProperty property = AllProperties, const QgsExpressionContext* context = 0 ); virtual void refreshDataDefinedProperty( const DataDefinedProperty property = AllProperties, const QgsExpressionContext* context = 0 );

4
python/core/qgspallabeling.sip
View File

@ -491,7 +491,7 @@ class QgsPalLayerSettings
* @param f feature to label * @param f feature to label
* @param context render context. The QgsExpressionContext contained within the render context * @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. * 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 ); void registerFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer );
@ -746,7 +746,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
* @param dxfLayer dxfLayer name * @param dxfLayer dxfLayer name
*/ */
virtual void registerFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext(), QString dxfLayer = QString::null ); 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() ); virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() );
//! called when the map is drawn and labels should be placed //! called when the map is drawn and labels should be placed
virtual void drawLabeling( QgsRenderContext& context ); virtual void drawLabeling( QgsRenderContext& context );

2
src/core/composer/qgscomposerobject.h
View File

@ -178,7 +178,7 @@ class CORE_EXPORT QgsComposerObject: public QObject
* @param property data defined property to refresh. If property is set to * @param property data defined property to refresh. If property is set to
* QgsComposerItem::AllProperties then all data defined properties for the item will be * QgsComposerItem::AllProperties then all data defined properties for the item will be
* refreshed. * 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 * @note this method was added in version 2.5
*/ */
virtual void refreshDataDefinedProperty( const DataDefinedProperty property = AllProperties, const QgsExpressionContext* context = 0 ); virtual void refreshDataDefinedProperty( const DataDefinedProperty property = AllProperties, const QgsExpressionContext* context = 0 );

2
src/core/qgspallabeling.h
View File

@ -466,7 +466,7 @@ class CORE_EXPORT QgsPalLayerSettings
* @param f feature to label * @param f feature to label
* @param context render context. The QgsExpressionContext contained within the render context * @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. * 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 ); void registerFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer );

5
src/gui/qgsvariableeditorwidget.cpp
View File

@ -54,9 +54,6 @@ class VariableEditorDelegate : public QItemDelegate
QIcon QgsVariableEditorTree::mExpandIcon; QIcon QgsVariableEditorTree::mExpandIcon;
/// @endcond
// //
// QgsVariableEditorWidget // QgsVariableEditorWidget
// //
@ -754,3 +751,5 @@ void VariableEditorDelegate::setModelData( QWidget* widget, QAbstractItemModel *
} }
mParentTree->refreshTree(); mParentTree->refreshTree();
} }
/// @endcond

6
src/server/qgswfsserver.cpp
View File

@ -468,9 +468,6 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
} }
QgsFeature feature; QgsFeature feature;
QgsAttributeMap featureAttributes;
//const QgsFields& fields = provider->fields();
const QgsFields& fields = layer->pendingFields();
mWithGeom = true; mWithGeom = true;
//QgsAttributeList attrIndexes = provider->attributeIndexes(); //QgsAttributeList attrIndexes = provider->attributeIndexes();
@ -821,9 +818,6 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
} }
QgsFeature feature; QgsFeature feature;
QgsAttributeMap featureAttributes;
//const QgsFields& fields = provider->fields();
const QgsFields& fields = layer->pendingFields();
//map extent //map extent
searchRect = layer->extent(); searchRect = layer->extent();