diff --git a/python/core/auto_generated/qgsrulebasedlabeling.sip.in b/python/core/auto_generated/qgsrulebasedlabeling.sip.in index fc8082cf4ea..6cc6fd51948 100644 --- a/python/core/auto_generated/qgsrulebasedlabeling.sip.in +++ b/python/core/auto_generated/qgsrulebasedlabeling.sip.in @@ -269,7 +269,6 @@ Constructs the labeling from given tree of rules (takes ownership) ~QgsRuleBasedLabeling(); QgsRuleBasedLabeling::Rule *rootRule(); - const Rule *rootRule() const; static QgsRuleBasedLabeling *create( const QDomElement &element, const QgsReadWriteContext &context ) /Factory/; %Docstring diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp index ea5cccfe0fa..8789df188af 100644 --- a/src/core/qgsrulebasedlabeling.cpp +++ b/src/core/qgsrulebasedlabeling.cpp @@ -418,7 +418,7 @@ QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule() return mRootRule.get(); } -const QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule() const SIP_SKIP +const QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule() const { return mRootRule.get(); } diff --git a/src/core/qgsrulebasedlabeling.h b/src/core/qgsrulebasedlabeling.h index 1c985ec3665..3c661bb1c81 100644 --- a/src/core/qgsrulebasedlabeling.h +++ b/src/core/qgsrulebasedlabeling.h @@ -347,7 +347,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling ~QgsRuleBasedLabeling() override; QgsRuleBasedLabeling::Rule *rootRule(); - const Rule *rootRule() const; + const Rule *rootRule() const SIP_SKIP; //! Create the instance from a DOM element with saved configuration static QgsRuleBasedLabeling *create( const QDomElement &element, const QgsReadWriteContext &context ) SIP_FACTORY; diff --git a/tests/code_layout/acceptable_missing_doc.py b/tests/code_layout/acceptable_missing_doc.py index 21fe479dd1e..a5ad04c3c59 100644 --- a/tests/code_layout/acceptable_missing_doc.py +++ b/tests/code_layout/acceptable_missing_doc.py @@ -213,7 +213,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsInterpolator": ['QgsInterpolator(const QList< QgsInterpolator::LayerData > &layerData)'], "QgsLUDialog": ['QgsLUDialog(QWidget *parent=nullptr, Qt::WindowFlags fl=QgsGuiUtils::ModalDialogFlags)', 'lowerValue() const', 'setLowerValue(const QString &val)', 'setUpperValue(const QString &val)', 'upperValue() const'], "QgsLabelCandidate": ['QgsLabelCandidate(const QRectF &r, double c)'], - "QgsLabelPosition": ['QgsLabelPosition(int id, double r, const QVector< QgsPointXY > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram=false, bool pinned=false, const QString &providerId=QString())'], + "QgsLabelPosition": ['QgsLabelPosition(QgsFeatureId id, double r, const QVector< QgsPointXY > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram=false, bool pinned=false, const QString &providerId=QString())'], "QgsLabelSorter": ['QgsLabelSorter(const QgsMapSettings &mapSettings)', 'operator()(pal::LabelPosition *lp1, pal::LabelPosition *lp2) const'], "QgsLabelingEngine": ['processProvider(QgsAbstractLabelProvider *provider, QgsRenderContext &context, pal::Pal &p)'], "QgsLayerItem": ['LayerType', 'QgsLayerItem(QgsDataItem *parent, const QString &name, const QString &path, const QString &uri, LayerType layerType, const QString &providerKey)', 'iconDefault()', 'iconLine()', 'iconPoint()', 'iconPolygon()', 'iconRaster()', 'iconTable()'],