Fix mention of compositions in dox (#34318)

qgis · Feb 6, 2020 · d2639bc · d2639bc
1 parent 224d6bc
commit d2639bc
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/python/core/auto_generated/layout/qgslayoutitempicture.sip.in b/python/core/auto_generated/layout/qgslayoutitempicture.sip.in
@@ -153,7 +153,7 @@ Sets the ``offset`` added to the picture's rotation from a map's North.
 
     ResizeMode resizeMode() const;
 %Docstring
-Returns the resize mode used for drawing the picture within the composer
+Returns the resize mode used for drawing the picture within the layout
 item's frame.
 
 .. seealso:: :py:func:`setResizeMode`

diff --git a/python/core/auto_generated/layout/qgslayouttable.sip.in b/python/core/auto_generated/layout/qgslayouttable.sip.in
@@ -22,7 +22,7 @@ typedef QVector< QgsLayoutTableColumn * > QgsLayoutTableColumns;
 class QgsLayoutTableStyle
 {
 %Docstring
-Styling option for a composer table cell
+Styling option for a layout table cell
 
 .. versionadded:: 3.0
 %End

diff --git a/python/core/auto_generated/layout/qgslayouttablecolumn.sip.in b/python/core/auto_generated/layout/qgslayouttablecolumn.sip.in
@@ -199,7 +199,7 @@ Sets the sort ``rank`` for the column. If the sort rank is > 0 then the column
 will be sorted in the table. The sort rank specifies the priority given to the
 column when the table is sorted by multiple columns, with lower sort ranks
 having higher priority. This property is only used when the column
-is part of a :py:class:`QgsComposerAttributeTable`.
+is part of a :py:class:`QgsLayoutItemAttributeTable`.
 If the sort ``rank`` is <= 0 then the column is not being sorted.
 
 .. note::

diff --git a/python/core/auto_generated/qgsproject.sip.in b/python/core/auto_generated/qgsproject.sip.in
@@ -575,7 +575,7 @@ an absolute path.
 
     QgsLayoutManager *layoutManager();
 %Docstring
-Returns the project's layout manager, which manages compositions within
+Returns the project's layout manager, which manages print layouts, atlases and reports within
 the project.
 
 .. versionadded:: 3.0

diff --git a/src/core/layout/qgslayoutitempicture.h b/src/core/layout/qgslayoutitempicture.h
@@ -155,7 +155,7 @@ class CORE_EXPORT QgsLayoutItemPicture: public QgsLayoutItem
     void setNorthOffset( double offset );
 
     /**
-     * Returns the resize mode used for drawing the picture within the composer
+     * Returns the resize mode used for drawing the picture within the layout
      * item's frame.
      * \see setResizeMode()
      */

diff --git a/src/core/layout/qgslayoutitemscalebar.h b/src/core/layout/qgslayoutitemscalebar.h
@@ -514,7 +514,7 @@ class CORE_EXPORT QgsLayoutItemScaleBar: public QgsLayoutItem
     //! Calculates with of a segment in mm and stores it in mSegmentMillimeters
     void refreshSegmentMillimeters();
 
-    //! Returns diagonal of composer map in selected units (map units / meters / feet / nautical miles)
+    //! Returns diagonal of layout map in selected units (map units / meters / feet / nautical miles)
     double mapWidth() const;
 
     QgsScaleBarRenderer::ScaleBarContext createScaleContext() const;

diff --git a/src/core/layout/qgslayouttable.h b/src/core/layout/qgslayouttable.h
@@ -31,7 +31,7 @@ class QgsLayoutTableColumn;
 /**
  * \ingroup core
  * List of QVariants, representing a the contents of a single row in
- * a QgsComposerTable
+ * a QgsLayoutTable
  * \since QGIS 3.0
 */
 typedef QVector< QVariant > QgsLayoutTableRow;
@@ -60,7 +60,7 @@ typedef QVector< QgsLayoutTableColumn * > QgsLayoutTableColumns;
 /**
  * \ingroup core
  *  \class QgsLayoutTableStyle
- *  \brief Styling option for a composer table cell
+ *  \brief Styling option for a layout table cell
  *  \since QGIS 3.0
  */
 

diff --git a/src/core/layout/qgslayouttablecolumn.h b/src/core/layout/qgslayouttablecolumn.h
@@ -173,7 +173,7 @@ class CORE_EXPORT QgsLayoutTableColumn : public QObject
      * will be sorted in the table. The sort rank specifies the priority given to the
      * column when the table is sorted by multiple columns, with lower sort ranks
      * having higher priority. This property is only used when the column
-     * is part of a QgsComposerAttributeTable.
+     * is part of a QgsLayoutItemAttributeTable.
      * If the sort \a rank is <= 0 then the column is not being sorted.
      *
      * \note only applicable when used in a QgsLayoutItemAttributeTable

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -565,15 +565,15 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
     QgsRelationManager *relationManager() const;
 
     /**
-     * Returns the project's layout manager, which manages compositions within
+     * Returns the project's layout manager, which manages print layouts, atlases and reports within
      * the project.
      * \note not available in Python bindings
      * \since QGIS 3.0
      */
     const QgsLayoutManager *layoutManager() const SIP_SKIP;
 
     /**
-     * Returns the project's layout manager, which manages compositions within
+     * Returns the project's layout manager, which manages print layouts, atlases and reports within
      * the project.
      * \since QGIS 3.0
      */