[sipify] Fix exposing members and default struct accessors

m-kuhn · m-kuhn · commit ebc1afe82cc1 · 2017-04-07T12:26:30.000+02:00
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

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas`
`248`	`248`	`*/`
`249`	`249`	`class CORE_EXPORT ClassWithPrivateInheritanceOnly : private QgsBaseClass`
`250`	`250`	`{`
	`251`	`+ public:`
`251`	`252`	`//! A constructor with definition in header on several lines`
`252`	`253`	`explicit ClassWithPrivateInheritanceOnly()`
`253`	`254`	`: QtClass<QVariant>()`
`@@ -257,7 +258,7 @@ class CORE_EXPORT ClassWithPrivateInheritanceOnly : private QgsBaseClass`
`257`	`258`	`haveFun();`
`258`	`259`	`}`
`259`	`260`
`260`		`-}`
	`261`	`+};`
`261`	`262`
`262`	`263`	`/**`
`263`	`264`	`* \class AbstractClass`