[sipify] Fix exposing members and default struct accessors

qgis · Apr 7, 2017 · ebc1afe · ebc1afe
1 parent c65f762
commit ebc1afe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -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
     {
@@ -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/
 {

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -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>()
@@ -257,7 +258,7 @@ class CORE_EXPORT ClassWithPrivateInheritanceOnly : private QgsBaseClass
       haveFun();
     }
 
-}
+};
 
 /**
  * \class AbstractClass