Skip to content

Commit a133bca

Browse files
authored
Fix sip bindings and ignore missing docs
1 parent 14352c7 commit a133bca

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

python/core/auto_generated/qgsrulebasedlabeling.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ Constructs the labeling from given tree of rules (takes ownership)
269269
~QgsRuleBasedLabeling();
270270

271271
QgsRuleBasedLabeling::Rule *rootRule();
272-
const Rule *rootRule() const;
273272

274273
static QgsRuleBasedLabeling *create( const QDomElement &element, const QgsReadWriteContext &context ) /Factory/;
275274
%Docstring

src/core/qgsrulebasedlabeling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule()
418418
return mRootRule.get();
419419
}
420420

421-
const QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule() const SIP_SKIP
421+
const QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule() const
422422
{
423423
return mRootRule.get();
424424
}

src/core/qgsrulebasedlabeling.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling
347347
~QgsRuleBasedLabeling() override;
348348

349349
QgsRuleBasedLabeling::Rule *rootRule();
350-
const Rule *rootRule() const;
350+
const Rule *rootRule() const SIP_SKIP;
351351

352352
//! Create the instance from a DOM element with saved configuration
353353
static QgsRuleBasedLabeling *create( const QDomElement &element, const QgsReadWriteContext &context ) SIP_FACTORY;

tests/code_layout/acceptable_missing_doc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
"QgsInterpolator": ['QgsInterpolator(const QList< QgsInterpolator::LayerData > &layerData)'],
214214
"QgsLUDialog": ['QgsLUDialog(QWidget *parent=nullptr, Qt::WindowFlags fl=QgsGuiUtils::ModalDialogFlags)', 'lowerValue() const', 'setLowerValue(const QString &val)', 'setUpperValue(const QString &val)', 'upperValue() const'],
215215
"QgsLabelCandidate": ['QgsLabelCandidate(const QRectF &r, double c)'],
216-
"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())'],
216+
"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())'],
217217
"QgsLabelSorter": ['QgsLabelSorter(const QgsMapSettings &mapSettings)', 'operator()(pal::LabelPosition *lp1, pal::LabelPosition *lp2) const'],
218218
"QgsLabelingEngine": ['processProvider(QgsAbstractLabelProvider *provider, QgsRenderContext &context, pal::Pal &p)'],
219219
"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()'],

0 commit comments

Comments
 (0)