Skip to content

Commit

Permalink
Fix sip bindings and ignore missing docs
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn authored Mar 10, 2019
1 parent 14352c7 commit a133bca
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion python/core/auto_generated/qgsrulebasedlabeling.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsrulebasedlabeling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsrulebasedlabeling.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/code_layout/acceptable_missing_doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"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()'],
Expand Down

0 comments on commit a133bca

Please sign in to comment.