Fix warnings

qgis · Aug 22, 2015 · c9c12bc · c9c12bc
1 parent 2edc85c
commit c9c12bc
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();