Skip to content
Permalink
Browse files
[sipify] skip non-public template based member declarations
  • Loading branch information
m-kuhn committed Apr 8, 2017
1 parent d820702 commit 14e949b96cb59fc6f44eeec2e17cf3b425fc9ec6
Showing with 7 additions and 5 deletions.
  1. +0 −3 python/core/qgscolorramp.sip
  2. +2 −2 scripts/sipify.pl
  3. +2 −0 tests/scripts/sipifyheader.expected.sip
  4. +3 −0 tests/scripts/sipifyheader.h
@@ -440,7 +440,6 @@ class QgsLimitedRandomColorRamp : QgsColorRamp
%End

protected:
QList<QColor> mColors;
};

class QgsRandomColorRamp: QgsColorRamp
@@ -498,7 +497,6 @@ class QgsRandomColorRamp: QgsColorRamp

protected:

QList<QColor> mPrecalculatedColors;

};

@@ -710,7 +708,6 @@ class QgsColorBrewerColorRamp : QgsColorRamp
Generates the scheme using the current name and number of colors
%End

QList<QColor> mPalette;
};


@@ -295,8 +295,8 @@ sub processDoxygenLine
next;
}

# skip non-method member declaration (in non-public sections)
if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s*\w+(::\w+)? \*?\w+( = \w+(\([^()]+\))?)?;/){
# skip non-method member declaration in non-public sections
if ( $SIP_RUN != 1 && $ACCESS != PUBLIC && $line =~ m/^\s*[\w<>]+(::\w+)? \*?\w+( = \w+(\([^()]+\))?)?;/){
next;
}

@@ -225,6 +225,8 @@ Removing function body with namespaced return value
:rtype: set of QgsActionScope
%End

This<Member> shouldBeIncluded;

protected:
bool thisShouldBeListed();
%Docstring
@@ -221,11 +221,14 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas

QSet<QgsActionScope> returnTypeSet();

This<Member> shouldBeIncluded;

protected:
bool thisShouldBeListed();

Whatever skipMember;
Whatever::Something *alsoSkipMember = nullptr;
Some<Other> memberToSkip;

private:
void privateMethodAreNotShown();

0 comments on commit 14e949b

Please sign in to comment.