Address review comments

qgis · Aug 5, 2020 · ca384b2 · ca384b2
1 parent 6b7bc82
commit ca384b2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/python/core/auto_generated/annotations/qgsannotationitem.sip.in b/python/core/auto_generated/annotations/qgsannotationitem.sip.in
@@ -22,15 +22,15 @@ Abstract base class for annotation items which are drawn with QgsAnnotationLayer
 #include "qgsannotationitem.h"
 %End
 %ConvertToSubClassCode
-    if ( sipCpp->type() == "marker" )
+    if ( sipCpp->type() == QLatin1String( "marker" ) )
     {
       sipType = sipType_QgsAnnotationMarkerItem;
     }
-    else if ( sipCpp->type() == "linestring" )
+    else if ( sipCpp->type() == QLatin1String( "linestring" ) )
     {
       sipType = sipType_QgsAnnotationLineStringItem;
     }
-    else if ( sipCpp->type() == "polygon" )
+    else if ( sipCpp->type() == QLatin1String( "polygon" ) )
     {
       sipType = sipType_QgsAnnotationPolygonItem;
     }
@@ -91,7 +91,7 @@ render operations.
 
     virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const = 0;
 %Docstring
-Writes the item's state the an XML ``element``.
+Writes the item's state into an XML ``element``.
 %End
 
     virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context ) = 0;

diff --git a/python/core/auto_generated/annotations/qgsannotationpolygonitem.sip.in b/python/core/auto_generated/annotations/qgsannotationpolygonitem.sip.in
@@ -75,7 +75,7 @@ Returns the symbol used to render the item.
 
     void setSymbol( QgsFillSymbol *symbol /Transfer/ );
 %Docstring
-Sets the ``symbol`` used to render the marker item.
+Sets the ``symbol`` used to render the polygon item.
 
 The item takes ownership of the symbol.
 

diff --git a/python/core/auto_generated/qgsapplication.sip.in b/python/core/auto_generated/qgsapplication.sip.in
@@ -743,7 +743,7 @@ Returns the application's layout item registry, used for layout item types.
 %Docstring
 Returns the application's annotation item registry, used for annotation item types.
 
-.. versionadded:: 3.12
+.. versionadded:: 3.16
 %End
 
     static QgsGpsConnectionRegistry *gpsConnectionRegistry() /KeepReference/;

diff --git a/src/core/annotations/qgsannotationitem.h b/src/core/annotations/qgsannotationitem.h
@@ -40,15 +40,15 @@ class CORE_EXPORT QgsAnnotationItem
 
 #ifdef SIP_RUN
     SIP_CONVERT_TO_SUBCLASS_CODE
-    if ( sipCpp->type() == "marker" )
+    if ( sipCpp->type() == QLatin1String( "marker" ) )
     {
       sipType = sipType_QgsAnnotationMarkerItem;
     }
-    else if ( sipCpp->type() == "linestring" )
+    else if ( sipCpp->type() == QLatin1String( "linestring" ) )
     {
       sipType = sipType_QgsAnnotationLineStringItem;
     }
-    else if ( sipCpp->type() == "polygon" )
+    else if ( sipCpp->type() == QLatin1String( "polygon" ) )
     {
       sipType = sipType_QgsAnnotationPolygonItem;
     }
@@ -116,7 +116,7 @@ class CORE_EXPORT QgsAnnotationItem
     virtual void render( QgsRenderContext &context, QgsFeedback *feedback ) = 0;
 
     /**
-     * Writes the item's state the an XML \a element.
+     * Writes the item's state into an XML \a element.
      */
     virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const = 0;
 

diff --git a/src/core/annotations/qgsannotationpolygonitem.h b/src/core/annotations/qgsannotationpolygonitem.h
@@ -78,7 +78,7 @@ class CORE_EXPORT QgsAnnotationPolygonItem : public QgsAnnotationItem
     const QgsFillSymbol *symbol() const;
 
     /**
-     * Sets the \a symbol used to render the marker item.
+     * Sets the \a symbol used to render the polygon item.
      *
      * The item takes ownership of the symbol.
      *

diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -685,7 +685,7 @@ class CORE_EXPORT QgsApplication : public QApplication
 
     /**
      * Returns the application's annotation item registry, used for annotation item types.
-     * \since QGIS 3.12
+     * \since QGIS 3.16
      */
     static QgsAnnotationItemRegistry *annotationItemRegistry() SIP_KEEPREFERENCE;