sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix sip bindings and ignore missing docs

Browse Source
This commit is contained in:
Matthias Kuhn 2019-03-10 18:37:41 +01:00 committed by GitHub
parent 14352c7230
commit a133bcae45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/core/auto_generated/qgsrulebasedlabeling.sip.in
View File

@ -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

2
src/core/qgsrulebasedlabeling.cpp
View File

@ -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();
}

2
src/core/qgsrulebasedlabeling.h
View File

@ -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;

2
tests/code_layout/acceptable_missing_doc.py
View File

@ -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()'],