doxygen fixes

Author: jef-n

doc/CMakeLists.txt

@@ -60,7 +60,7 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/core/diagram
       ${CMAKE_SOURCE_DIR}/src/core/dxf
       ${CMAKE_SOURCE_DIR}/src/core/effects
-      ${CMAKE_SOURCE_DIR}/src/core/expressions
+      ${CMAKE_SOURCE_DIR}/src/core/expression
       ${CMAKE_SOURCE_DIR}/src/core/fieldformatter
       ${CMAKE_SOURCE_DIR}/src/core/geometry
       ${CMAKE_SOURCE_DIR}/src/core/geocms

python/core/expression/qgsexpression.sip.in

@@ -485,8 +485,6 @@ Returns the help text for a specified function.
 Returns the help text for a specified variable.
 
 :param variableName: name of variable
-:param showValue: set to true to include current value of variable in help text
-:param value: current value of variable to show in help text
 
 .. seealso:: :py:func:`helpText`
 

python/core/geometry/qgsgeometryutils.sip.in

@@ -147,12 +147,14 @@ supported and is retrieved from the first 3D point amongst ``p1`` and
  Compute the intersection of a line and a circle.
 If the intersection has two solutions (points),
 the closest point to the initial ``intersection`` point is returned.
-@param center the center of the circle
-@param radius the radius of the circle
-@param linePoint1 a first point on the line
-@param linePoint2 a second point on the line
-@param intersection the initial point and the returned intersection point
-@return true if an intersection has been found
+
+:param center: the center of the circle
+:param radius: the radius of the circle
+:param linePoint1: a first point on the line
+:param linePoint2: a second point on the line
+:param intersection: the initial point and the returned intersection point
+
+:return: true if an intersection has been found
 %End
 
     static int circleCircleIntersections( QgsPointXY center1, double radius1,

python/gui/editorwidgets/qgsdatetimeedit.sip.in

@@ -77,7 +77,8 @@ Resets the widget to show no value (ie, an "unknown" state).
     void valueChanged( const QDateTime &date );
 %Docstring
 signal emitted whenever the value changes.
-@param date the new date/time value.
+
+:param date: the new date/time value.
 %End
 
   protected:

python/gui/qgsattributeeditorcontext.sip.in

@@ -48,16 +48,55 @@ Constructor for QgsAttributeEditorContext
     QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, const QgsRelation &relation, RelationMode relationMode, FormMode widgetMode );
 
     void setDistanceArea( const QgsDistanceArea &distanceArea );
+%Docstring
+Sets distance area object for area/length calculations
+
+:param distanceArea: map canvas
+
+.. seealso:: :py:func:`setDistanceArea`
+
+.. versionadded:: 2.2
+%End
 
     const QgsDistanceArea &distanceArea() const;
 
     void setMapCanvas( QgsMapCanvas *mapCanvas );
+%Docstring
+Sets the map canvas (e.g. to zoom to related features)
+
+:param mapCanvas: map canvas
+
+.. seealso:: :py:func:`mapCanvas`
+
+.. versionadded:: 3.2
+%End
     QgsMapCanvas *mapCanvas() const;
 
     void setVectorLayerTools( QgsVectorLayerTools *vlTools );
+%Docstring
+Sets the vector layer tools
+
+:param vlTools: vector layer tools
+
+.. seealso:: :py:func:`vectorLayerTools`
+
+.. versionadded:: 2.2
+%End
     const QgsVectorLayerTools *vectorLayerTools() const;
 
     void setRelation( const QgsRelation &relation, RelationMode mode );
+%Docstring
+Set attribute relation and mode
+
+:param relation: relation
+:param mode: relation mode
+
+.. seealso:: :py:func:`relation`
+
+.. seealso:: :py:func:`relationMode`
+
+.. versionadded:: 2.6
+%End
     const QgsRelation &relation() const;
     RelationMode relationMode() const;
 

python/gui/qgsoptionsdialoghighlightwidget.sip.in

@@ -29,7 +29,8 @@ This uses stylesheets.
 %Docstring
 create a highlight widget implementation for the proper widget type.
 For instance a QgsOptionsDialogHighlightButton for button.
-@return a QgsOptionsDialogHighlightWidget or a None if there is no implementation
+
+:return: a QgsOptionsDialogHighlightWidget or a None if there is no implementation
 for the given widget.
 %End
 

python/server/qgsserverprojectutils.sip.in

@@ -355,7 +355,8 @@ Returns the WFS service url defined in a QGIS project.
 Returns the Layer ids list defined in a QGIS project as published in WFS.
 
 :param project: the QGIS project
-@return the Layer ids list.
+
+:return: the Layer ids list.
 %End
 
 
@@ -365,31 +366,35 @@ Returns the Layer precision defined in a QGIS project for the WFS GetFeature.
 
 :param project: the QGIS project
 :param layerId: the layer id in the project
-@return the layer precision for WFS GetFeature.
+
+:return: the layer precision for WFS GetFeature.
 %End
 
   QStringList wfstUpdateLayerIds( const QgsProject &project );
 %Docstring
 Returns the Layer ids list defined in a QGIS project as published as WFS-T with update capabilities.
 
 :param project: the QGIS project
-@return the Layer ids list.
+
+:return: the Layer ids list.
 %End
 
   QStringList wfstInsertLayerIds( const QgsProject &project );
 %Docstring
 Returns the Layer ids list defined in a QGIS project as published as WFS-T with insert capabilities.
 
 :param project: the QGIS project
-@return the Layer ids list.
+
+:return: the Layer ids list.
 %End
 
   QStringList wfstDeleteLayerIds( const QgsProject &project );
 %Docstring
 Returns the Layer ids list defined in a QGIS project as published as WFS-T with delete capabilities.
 
 :param project: the QGIS project
-@return the Layer ids list.
+
+:return: the Layer ids list.
 %End
 
   QString wcsServiceUrl( const QgsProject &project );

python/server/qgsserverrequest.sip.in

@@ -94,7 +94,8 @@ Remove a parameter
 Return the header value
 
 :param name: of the header
-@return the header value or an empty string
+
+:return: the header value or an empty string
 %End
 
     void setHeader( const QString &name, const QString &value );
@@ -108,7 +109,8 @@ Set an header
     QMap<QString, QString> headers() const;
 %Docstring
 Return the header map
-@return the headers map
+
+:return: the headers map
 %End
 
     void removeHeader( const QString &name );

src/3d/terrain/quantizedmeshgeometry.cpp

@@ -26,10 +26,10 @@
 #define GZIP_CHUNK_SIZE 32 * 1024
 
 /**
- * @brief Decompresses the given buffer using the standard GZIP algorithm
- * @param input The buffer to be decompressed
- * @param output The result of the decompression
- * @return @c true if the decompression was successful, @c false otherwise
+ * \brief Decompresses the given buffer using the standard GZIP algorithm
+ * \param input The buffer to be decompressed
+ * \param output The result of the decompression
+ * \return \c true if the decompression was successful, \c false otherwise
  */
 bool gzipDecompress( QByteArray input, QByteArray &output )
 {