Skip to content

Commit

Permalink
[sipify] Fix exposing members and default struct accessors
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Apr 7, 2017
1 parent c65f762 commit ebc1afe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions tests/scripts/sipifyheader.expected.sip
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,12 @@ class QgsSipifyHeader : QtClass<QVariant>
%TypeHeaderCode
#include "sipifyheader.h"
%End

%ConvertToSubClassCode
if ( sipCpp->headerType() == QgsSipifyHeader::Special )
sipType = sipType_QgsSpecialSipifyHeader;
else
sipType = sipType_QgsStandardSipifyHeader;
%End

public:
enum MyEnum
{
Expand Down Expand Up @@ -194,12 +192,13 @@ class ClassWithPrivateInheritanceOnly
%TypeHeaderCode
#include "sipifyheader.h"
%End
public:
explicit ClassWithPrivateInheritanceOnly();
%Docstring
A constructor with definition in header on several lines
%End

}
};

class AbstractClass /Abstract/
{
Expand Down
3 changes: 2 additions & 1 deletion tests/scripts/sipifyheader.h
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
*/
class CORE_EXPORT ClassWithPrivateInheritanceOnly : private QgsBaseClass
{
public:
//! A constructor with definition in header on several lines
explicit ClassWithPrivateInheritanceOnly()
: QtClass<QVariant>()
Expand All @@ -257,7 +258,7 @@ class CORE_EXPORT ClassWithPrivateInheritanceOnly : private QgsBaseClass
haveFun();
}

}
};

/**
* \class AbstractClass
Expand Down

0 comments on commit ebc1afe

Please sign in to comment.