Merge pull request #81 from mappu/miqt-refactor

Add QPair, improved include guards, container comments

cmd/genbindings/clang2il.go

@@ -433,11 +433,6 @@ nextMethod:
 			var mm CppMethod
 			mm.MethodName = methodName
 
-			if strings.Contains(methodName, `QGADGET`) {
-				log.Printf("Skipping method %q with weird QGADGET behaviour\n", mm.MethodName)
-				continue
-			}
-
 			err := parseMethod(node, &mm)
 			if err != nil {
 				if errors.Is(err, ErrTooComplex) {
@@ -585,11 +580,9 @@ nextEnumEntry:
 			// Best case: .inner -> kind=ImplicitCastExpr .inner -> kind=ConstantExpr value=xx
 			// e.g. QCalendar (when there is a int typecast)
 			if ei1Kind == "ImplicitCastExpr" {
-				log.Printf("Got ImplicitCastExpr OK")
 				if ei2, ok := ei1_0["inner"].([]interface{}); ok && len(ei2) > 0 {
 					ei2_0 := ei2[0].(map[string]interface{})
 					if ei2Kind, ok := ei2_0["kind"].(string); ok && ei2Kind == "ConstantExpr" {
-						log.Printf("Got ConstantExpr OK")
 						if ei2Value, ok := ei2_0["value"].(string); ok {
 							cee.EntryValue = ei2Value
 							goto afterParse
@@ -609,7 +602,7 @@ nextEnumEntry:
 		if !foundValidInner {
 			// Enum case without definition e.g. QCalendar::Gregorian
 			// This means one more than the last value
-			cee.EntryValue = fmt.Sprintf("%d", lastImplicitValue+1)
+			cee.EntryValue = strconv.FormatInt(lastImplicitValue+1, 10)
 		}
 
 	afterParse:

cmd/genbindings/config-allowlist.go

@@ -171,7 +171,7 @@ func AllowClass(className string) bool {
 }
 
 func AllowSignal(mm CppMethod) bool {
-	if mm.ReturnType.ParameterType != "void" {
+	if !mm.ReturnType.Void() {
 		// This affects how we cast the signal function pointer for connect
 		// It would be fixable, but, real signals always have void return types anyway
 		return false
@@ -197,6 +197,10 @@ func AllowMethod(className string, mm CppMethod) error {
 		return ErrTooComplex // Skip private type
 	}
 
+	if strings.Contains(mm.MethodName, `QGADGET`) {
+		return ErrTooComplex // Skipping method with weird QGADGET behaviour
+	}
+
 	if mm.IsReceiverMethod() {
 		// Non-projectable receiver pattern parameters
 		return ErrTooComplex
@@ -214,6 +218,12 @@ func AllowMethod(className string, mm CppMethod) error {
 		return ErrTooComplex // Qt 6: Present in header, but no-op method was not included in compiled library
 	}
 
+	if className == "QDeadlineTimer" && mm.MethodName == "_q_data" {
+		// Qt 6.4: Present in header with "not a public method" comment, not present in Qt 6.6
+		// @ref https://github.com/qt/qtbase/blob/v6.4.0/src/corelib/kernel/qdeadlinetimer.h#L156C29-L156C36
+		return ErrTooComplex
+	}
+
 	return nil // OK, allow
 }
 
@@ -222,9 +232,6 @@ func AllowMethod(className string, mm CppMethod) error {
 // Any type not permitted by AllowClass is also not permitted by this method.
 func AllowType(p CppParameter, isReturnType bool) error {
 
-	if p.QPairOf() {
-		return ErrTooComplex // e.g. QGradientStop
-	}
 	if t, ok := p.QSetOf(); ok {
 		if err := AllowType(t, isReturnType); err != nil {
 			return err
@@ -254,6 +261,14 @@ func AllowType(p CppParameter, isReturnType bool) error {
 			return ErrTooComplex
 		}
 	}
+	if kType, vType, ok := p.QPairOf(); ok {
+		if err := AllowType(kType, isReturnType); err != nil {
+			return err
+		}
+		if err := AllowType(vType, isReturnType); err != nil {
+			return err
+		}
+	}
 	if p.QMultiMapOf() {
 		return ErrTooComplex // e.g. Qt5 QNetwork qsslcertificate.h has a QMultiMap<QSsl::AlternativeNameEntryType, QString>
 	}

cmd/genbindings/emitcabi.go

@@ -6,6 +6,14 @@ import (
 	"strings"
 )
 
+// cppComment renders a string safely in a C++ block comment.
+// It strips interior nested comments.
+func cppComment(s string) string {
+	// Remove nested comments
+	uncomment := strings.NewReplacer("/*", "", "*/", "")
+	return "/* " + uncomment.Replace(s) + " */ "
+}
+
 func (p CppParameter) RenderTypeCabi() string {
 
 	if p.ParameterType == "QString" {
@@ -14,14 +22,17 @@ func (p CppParameter) RenderTypeCabi() string {
 	} else if p.ParameterType == "QByteArray" {
 		return "struct miqt_string"
 
-	} else if _, ok := p.QListOf(); ok {
+	} else if inner, ok := p.QListOf(); ok {
-		return "struct miqt_array"
+		return "struct miqt_array " + cppComment("of "+inner.RenderTypeCabi())
 
-	} else if _, ok := p.QSetOf(); ok {
+	} else if inner, ok := p.QSetOf(); ok {
-		return "struct miqt_array"
+		return "struct miqt_array " + cppComment("set of "+inner.RenderTypeCabi())
 
-	} else if _, _, ok := p.QMapOf(); ok {
+	} else if inner1, inner2, ok := p.QMapOf(); ok {
-		return "struct miqt_map"
+		return "struct miqt_map " + cppComment("of "+inner1.RenderTypeCabi()+" to "+inner2.RenderTypeCabi())
+
+	} else if inner1, inner2, ok := p.QPairOf(); ok {
+		return "struct miqt_map " + cppComment("tuple of "+inner1.RenderTypeCabi()+" and "+inner2.RenderTypeCabi())
 
 	} else if (p.Pointer || p.ByRef) && p.QtClassType() {
 		return cabiClassName(p.ParameterType) + "*"
@@ -151,36 +162,8 @@ func emitParametersCabi(m CppMethod, selfType string) string {
 	}
 
 	for _, p := range m.Parameters {
-		if p.ParameterType == "QString" {
-			tmp = append(tmp, "struct miqt_string "+p.ParameterName)
-
-		} else if p.ParameterType == "QByteArray" {
-			tmp = append(tmp, "struct miqt_string "+p.ParameterName)
-
-		} else if t, ok := p.QListOf(); ok {
-			tmp = append(tmp, "struct miqt_array /* of "+t.RenderTypeCabi()+" */ "+p.ParameterName)
-
-		} else if t, ok := p.QSetOf(); ok {
-			tmp = append(tmp, "struct miqt_array /* Set of "+t.RenderTypeCabi()+" */ "+p.ParameterName)
-
-		} else if p.QtClassType() {
-			if p.ByRef || p.Pointer {
-
-				// Pointer to Qt type
-				// Replace with taking our PQ typedef by value
-				tmp = append(tmp, cabiClassName(p.ParameterType)+"* "+p.ParameterName)
-			} else {
-				// Qt type passed by value
-				// The CABI will unconditionally take these by pointer and dereference them
-				// when passing to C++
-				tmp = append(tmp, cabiClassName(p.ParameterType)+"* "+p.ParameterName)
-			}
-
-		} else {
-			// RenderTypeCabi renders both pointer+reference as pointers
 		tmp = append(tmp, p.RenderTypeCabi()+" "+p.ParameterName)
 	}
-	}
 
 	return strings.Join(tmp, ", ")
 }
@@ -198,7 +181,8 @@ func emitParametersCABI2CppForwarding(params []CppParameter, indent string) (pre
 }
 
 func makeNamePrefix(in string) string {
-	return strings.Replace(strings.Replace(in, `[`, `_`, -1), `]`, "", -1)
+	replacer := strings.NewReplacer(`[`, `_`, `]`, "", `.`, `_`)
+	return replacer.Replace(in)
 }
 
 func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, forwarding string) {
@@ -266,6 +250,25 @@ func emitCABI2CppForwarding(p CppParameter, indent string) (preamble string, for
 		preamble += indent + "}\n"
 		return preamble, nameprefix + "_QMap"
 
+	} else if kType, vType, ok := p.QPairOf(); ok {
+		preamble += indent + p.GetQtCppType().ParameterType + " " + nameprefix + "_QPair;\n"
+
+		preamble += indent + kType.RenderTypeCabi() + "* " + nameprefix + "_first_arr = static_cast<" + kType.RenderTypeCabi() + "*>(" + p.ParameterName + ".keys);\n"
+		preamble += indent + vType.RenderTypeCabi() + "* " + nameprefix + "_second_arr = static_cast<" + vType.RenderTypeCabi() + "*>(" + p.ParameterName + ".values);\n"
+
+		kType.ParameterName = nameprefix + "_first_arr[0]"
+		addPreK, addFwdK := emitCABI2CppForwarding(kType, indent+"\t")
+		preamble += addPreK
+
+		vType.ParameterName = nameprefix + "_second_arr[0]"
+		addPreV, addFwdV := emitCABI2CppForwarding(vType, indent+"\t")
+		preamble += addPreV
+
+		preamble += indent + nameprefix + "_QPair.first = " + addFwdK + ";\n"
+		preamble += indent + nameprefix + "_QPair.second = " + addFwdV + ";\n"
+
+		return preamble, nameprefix + "_QPair"
+
 	} else if p.IsFlagType() || p.IntType() || p.IsKnownEnum() {
 		castSrc := p.ParameterName
 		castType := p.RenderTypeQtCpp()
@@ -343,8 +346,9 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 
 	namePrefix := makeNamePrefix(p.ParameterName)
 
-	if p.ParameterType == "void" && !p.Pointer {
+	if p.Void() {
 		shouldReturn = ""
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if p.ParameterType == "QString" {
 
@@ -368,6 +372,7 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 		afterCall += indent + namePrefix + "_ms.data = static_cast<char*>(malloc(" + namePrefix + "_ms.len));\n"
 		afterCall += indent + "memcpy(" + namePrefix + "_ms.data, " + namePrefix + "_b.data(), " + namePrefix + "_ms.len);\n"
 		afterCall += indent + assignExpression + namePrefix + "_ms;\n"
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if p.ParameterType == "QByteArray" {
 		// C++ has given us a QByteArray. CABI needs this as a struct miqt_string
@@ -380,6 +385,7 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 		afterCall += indent + namePrefix + "_ms.data = static_cast<char*>(malloc(" + namePrefix + "_ms.len));\n"
 		afterCall += indent + "memcpy(" + namePrefix + "_ms.data, " + namePrefix + "_qb.data(), " + namePrefix + "_ms.len);\n"
 		afterCall += indent + assignExpression + namePrefix + "_ms;\n"
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if t, ok := p.QListOf(); ok {
 
@@ -402,6 +408,7 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 		afterCall += indent + "" + namePrefix + "_out.data = static_cast<void*>(" + namePrefix + "_arr);\n"
 
 		afterCall += indent + assignExpression + "" + namePrefix + "_out;\n"
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if t, ok := p.QSetOf(); ok {
 
@@ -420,6 +427,7 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 		afterCall += indent + "" + namePrefix + "_out.data = static_cast<void*>(" + namePrefix + "_arr);\n"
 
 		afterCall += indent + assignExpression + "" + namePrefix + "_out;\n"
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if kType, vType, ok := p.QMapOf(); ok {
 		// QMap<K,V>
@@ -444,6 +452,27 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 		afterCall += indent + "" + namePrefix + "_out.values = static_cast<void*>(" + namePrefix + "_varr);\n"
 
 		afterCall += indent + assignExpression + "" + namePrefix + "_out;\n"
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
+
+	} else if kType, vType, ok := p.QPairOf(); ok {
+		// QPair<T1,T2>
+
+		shouldReturn = p.RenderTypeQtCpp() + " " + namePrefix + "_ret = "
+
+		afterCall += indent + "// Convert QPair<> from C++ memory to manually-managed C memory\n"
+		afterCall += indent + "" + kType.RenderTypeCabi() + "* " + namePrefix + "_first_arr = static_cast<" + kType.RenderTypeCabi() + "*>(malloc(sizeof(" + kType.RenderTypeCabi() + ")));\n"
+		afterCall += indent + "" + vType.RenderTypeCabi() + "* " + namePrefix + "_second_arr = static_cast<" + vType.RenderTypeCabi() + "*>(malloc(sizeof(" + vType.RenderTypeCabi() + ")));\n"
+
+		afterCall += emitAssignCppToCabi(indent+namePrefix+"_first_arr[0] = ", kType, namePrefix+"_ret.first")
+		afterCall += emitAssignCppToCabi(indent+namePrefix+"_second_arr[0] = ", vType, namePrefix+"_ret.second")
+
+		afterCall += indent + "struct miqt_map " + namePrefix + "_out;\n"
+		afterCall += indent + "" + namePrefix + "_out.len = 1;\n"
+		afterCall += indent + "" + namePrefix + "_out.keys = static_cast<void*>(" + namePrefix + "_first_arr);\n"
+		afterCall += indent + "" + namePrefix + "_out.values = static_cast<void*>(" + namePrefix + "_second_arr);\n"
+
+		afterCall += indent + assignExpression + "" + namePrefix + "_out;\n"
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if p.QtClassType() && p.ByRef {
 		// It's a pointer in disguise, just needs one cast
@@ -459,6 +488,7 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 		} else {
 			afterCall += indent + "" + assignExpression + "&" + namePrefix + "_ret;\n"
 		}
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if p.QtClassType() && !p.Pointer {
 
@@ -474,15 +504,24 @@ func emitAssignCppToCabi(assignExpression string, p CppParameter, rvalue string)
 		} else {
 			afterCall += indent + "" + assignExpression + "static_cast<" + p.RenderTypeCabi() + ">(" + namePrefix + "_ret);\n"
 		}
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
 	} else if p.Const {
 		shouldReturn += "(" + p.RenderTypeCabi() + ") "
+		return indent + shouldReturn + rvalue + ";\n" + afterCall
 
+	} else {
+		// Basic type
+		if p.ByRef {
+			// The C++ type is a reference, the CABI type is a pointer type
+			shouldReturn += "&"
 		}
 
 		return indent + shouldReturn + rvalue + ";\n" + afterCall
 	}
 
+}
+
 // getReferencedTypes finds all referenced Qt types in this file.
 func getReferencedTypes(src *CppParsedHeader) []string {
 
@@ -570,7 +609,7 @@ func cabiPreventStructDeclaration(className string) bool {
 func emitBindingHeader(src *CppParsedHeader, filename string, packageName string) (string, error) {
 	ret := strings.Builder{}
 
-	includeGuard := "GEN_" + strings.ToUpper(strings.Replace(strings.Replace(filename, `.`, `_`, -1), `-`, `_`, -1))
+	includeGuard := "MIQT_" + strings.ToUpper(strings.Replace(strings.Replace(packageName, `/`, `_`, -1), `-`, `_`, -1)) + "_GEN_" + strings.ToUpper(strings.Replace(strings.Replace(filename, `.`, `_`, -1), `-`, `_`, -1))
 
 	bindingInclude := "../libmiqt/libmiqt.h"
 
@@ -578,7 +617,8 @@ func emitBindingHeader(src *CppParsedHeader, filename string, packageName string
 		bindingInclude = "../" + bindingInclude
 	}
 
-	ret.WriteString(`#ifndef ` + includeGuard + `
+	ret.WriteString(`#pragma once
+#ifndef ` + includeGuard + `
 #define ` + includeGuard + `
 
 #include <stdbool.h>

cmd/genbindings/emitgo.go

@@ -43,6 +43,12 @@ func (p CppParameter) RenderTypeGo(gfs *goFileState) string {
 		return "map[" + t1.RenderTypeGo(gfs) + "]" + t2.RenderTypeGo(gfs)
 	}
 
+	if t1, t2, ok := p.QPairOf(); ok {
+		// Design QPair using capital-named members, in case it gets passed
+		// across packages
+		return "struct { First " + t1.RenderTypeGo(gfs) + " ; Second " + t2.RenderTypeGo(gfs) + " }"
+	}
+
 	if p.ParameterType == "void" && p.Pointer {
 		return "unsafe.Pointer"
 	}
@@ -169,6 +175,15 @@ func (p CppParameter) parameterTypeCgo() string {
 		return "C.struct_miqt_map"
 	}
 
+	if _, _, ok := p.QPairOf(); ok {
+		return "C.struct_miqt_map"
+	}
+
+	// Cgo internally binds void* as unsafe.Pointer{}
+	if p.ParameterType == "void" && p.Pointer {
+		return "unsafe.Pointer"
+	}
+
 	tmp := strings.Replace(p.RenderTypeCabi(), `*`, "", -1)
 
 	if strings.HasPrefix(tmp, "const ") && tmp != "const char" { // Special typedef to make this work for const char* signal parameters
@@ -321,9 +336,9 @@ func (gfs *goFileState) emitParameterGo2CABIForwarding(p CppParameter) (preamble
 		preamble += nameprefix + "_CArray[i] = " + innerRvalue + "\n"
 		preamble += "}\n"
 
-		preamble += p.ParameterName + "_ma := C.struct_miqt_array{len: C.size_t(len(" + p.ParameterName + ")), data: unsafe.Pointer(" + nameprefix + "_CArray)}\n"
+		preamble += nameprefix + "_ma := C.struct_miqt_array{len: C.size_t(len(" + p.ParameterName + ")), data: unsafe.Pointer(" + nameprefix + "_CArray)}\n"
 
-		rvalue = p.ParameterName + "_ma"
+		rvalue = nameprefix + "_ma"
 
 	} else if _, ok := p.QSetOf(); ok {
 		panic("QSet<> arguments are not yet implemented") // n.b. doesn't seem to exist in QtCore/QtGui/QtWidgets at all
@@ -357,9 +372,34 @@ func (gfs *goFileState) emitParameterGo2CABIForwarding(p CppParameter) (preamble
 
 		preamble += "}\n"
 
-		preamble += p.ParameterName + "_mm := C.struct_miqt_map{\nlen: C.size_t(len(" + p.ParameterName + ")),\nkeys: unsafe.Pointer(" + nameprefix + "_Keys_CArray),\nvalues: unsafe.Pointer(" + nameprefix + "_Values_CArray),\n}\n"
+		preamble += nameprefix + "_mm := C.struct_miqt_map{\nlen: C.size_t(len(" + p.ParameterName + ")),\nkeys: unsafe.Pointer(" + nameprefix + "_Keys_CArray),\nvalues: unsafe.Pointer(" + nameprefix + "_Values_CArray),\n}\n"
 
-		rvalue = p.ParameterName + "_mm"
+		rvalue = nameprefix + "_mm"
+
+	} else if kType, vType, ok := p.QPairOf(); ok {
+		// QPair<T>
+
+		gfs.imports["unsafe"] = struct{}{}
+
+		preamble += nameprefix + "_First_CArray := (*[0xffff]" + kType.parameterTypeCgo() + ")(C.malloc(C.size_t(" + kType.mallocSizeCgoExpression() + ")))\n"
+		preamble += "defer C.free(unsafe.Pointer(" + nameprefix + "_First_CArray))\n"
+
+		preamble += nameprefix + "_Second_CArray := (*[0xffff]" + vType.parameterTypeCgo() + ")(C.malloc(C.size_t(" + vType.mallocSizeCgoExpression() + ")))\n"
+		preamble += "defer C.free(unsafe.Pointer(" + nameprefix + "_Second_CArray))\n"
+
+		kType.ParameterName = p.ParameterName + ".First"
+		addPreamble, innerRvalue := gfs.emitParameterGo2CABIForwarding(kType)
+		preamble += addPreamble
+		preamble += nameprefix + "_First_CArray[0] = " + innerRvalue + "\n"
+
+		vType.ParameterName = p.ParameterName + ".Second"
+		addPreamble, innerRvalue = gfs.emitParameterGo2CABIForwarding(vType)
+		preamble += addPreamble
+		preamble += nameprefix + "_Second_CArray[0] = " + innerRvalue + "\n"
+
+		preamble += nameprefix + "_pair := C.struct_miqt_map{\nlen: 1,\nkeys: unsafe.Pointer(" + nameprefix + "_First_CArray),\nvalues: unsafe.Pointer(" + nameprefix + "_Second_CArray),\n}\n"
+
+		rvalue = nameprefix + "_pair"
 
 	} else if p.Pointer && p.ParameterType == "char" {
 		// Single char* argument
@@ -404,7 +444,7 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue
 	afterword := ""
 	namePrefix := makeNamePrefix(rt.ParameterName)
 
-	if rt.ParameterType == "void" && !rt.Pointer {
+	if rt.Void() {
 		shouldReturn = ""
 		return shouldReturn + " " + rvalue + "\n" + afterword
 
@@ -500,6 +540,20 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue
 		afterword += assignExpr + " " + namePrefix + "_ret\n"
 		return shouldReturn + " " + rvalue + "\n" + afterword
 
+	} else if kType, vType, ok := rt.QPairOf(); ok {
+		gfs.imports["unsafe"] = struct{}{}
+
+		shouldReturn = "var " + namePrefix + "_mm C.struct_miqt_map = "
+
+		afterword += namePrefix + "_First_CArray := (*[0xffff]" + kType.parameterTypeCgo() + ")(unsafe.Pointer(" + namePrefix + "_mm.keys))\n"
+		afterword += namePrefix + "_Second_CArray := (*[0xffff]" + vType.parameterTypeCgo() + ")(unsafe.Pointer(" + namePrefix + "_mm.values))\n"
+
+		afterword += gfs.emitCabiToGo(namePrefix+"_entry_First := ", kType, namePrefix+"_First_CArray[0]") + "\n"
+		afterword += gfs.emitCabiToGo(namePrefix+"_entry_Second := ", vType, namePrefix+"_Second_CArray[0]") + "\n"
+
+		afterword += assignExpr + " " + rt.RenderTypeGo(gfs) + " { First: " + namePrefix + "_entry_First , Second: " + namePrefix + "_entry_Second }\n"
+		return shouldReturn + " " + rvalue + "\n" + afterword
+
 	} else if rt.QtClassType() {
 		// Construct our Go type based on this inner CABI type
 		shouldReturn = "" + namePrefix + "_ret := "
@@ -542,6 +596,14 @@ func (gfs *goFileState) emitCabiToGo(assignExpr string, rt CppParameter, rvalue
 		return shouldReturn + " " + rvalue + "\n" + afterword
 
 	} else if rt.IntType() || rt.IsKnownEnum() || rt.IsFlagType() || rt.ParameterType == "bool" || rt.QtCppOriginalType != nil {
+
+		if rt.Pointer || rt.ByRef {
+			// Cast must go via unsafe.Pointer
+			gfs.imports["unsafe"] = struct{}{}
+			return assignExpr + "(" + rt.RenderTypeGo(gfs) + ")(unsafe.Pointer(" + rvalue + "))\n"
+
+		}
+
 		// Need to cast Cgo type to Go int type
 		// Optimize assignment to avoid temporary
 		return assignExpr + "(" + rt.RenderTypeGo(gfs) + ")(" + rvalue + ")\n"

cmd/genbindings/intermediate.go

@@ -5,32 +5,6 @@ import (
 	"strings"
 )
 
-type lookupResultClass struct {
-	PackageName string
-}
-
-type lookupResultTypedef struct {
-	PackageName string
-	Typedef     CppTypedef
-}
-
-type lookupResultEnum struct {
-	PackageName string
-	Enum        CppEnum
-}
-
-var (
-	KnownClassnames map[string]lookupResultClass // Entries of the form QFoo::Bar if it is an inner class
-	KnownTypedefs   map[string]lookupResultTypedef
-	KnownEnums      map[string]lookupResultEnum
-)
-
-func flushKnownTypes() {
-	KnownClassnames = make(map[string]lookupResultClass)
-	KnownTypedefs = make(map[string]lookupResultTypedef)
-	KnownEnums = make(map[string]lookupResultEnum)
-}
-
 type CppParameter struct {
 	ParameterName string
 	ParameterType string
@@ -177,8 +151,21 @@ func (p CppParameter) QMapOf() (CppParameter, CppParameter, bool) {
 	return CppParameter{}, CppParameter{}, false
 }
 
-func (p CppParameter) QPairOf() bool {
+func (p CppParameter) QPairOf() (CppParameter, CppParameter, bool) {
-	return strings.HasPrefix(p.ParameterType, `QPair<`) // TODO support this
+	if strings.HasPrefix(p.ParameterType, `QPair<`) && strings.HasSuffix(p.ParameterType, `>`) {
+		interior := tokenizeMultipleParameters(p.ParameterType[6 : len(p.ParameterType)-1])
+		if len(interior) != 2 {
+			panic("QPair<> has unexpected number of template arguments")
+		}
+
+		first := parseSingleTypeString(interior[0])
+		first.ParameterName = p.ParameterName + "_first"
+		second := parseSingleTypeString(interior[1])
+		second.ParameterName = p.ParameterName + "_second"
+		return first, second, true
+	}
+
+	return CppParameter{}, CppParameter{}, false
 }
 
 func (p CppParameter) QSetOf() (CppParameter, bool) {
@@ -233,6 +220,10 @@ func (p CppParameter) IntType() bool {
 	}
 }
 
+func (p CppParameter) Void() bool {
+	return p.ParameterType == "void" && !p.Pointer
+}
+
 type CppProperty struct {
 	PropertyName string
 	PropertyType string

cmd/genbindings/main.go

@@ -164,15 +164,7 @@ func generate(packageName string, srcDirs []string, allowHeaderFn func(string) b
 		atr.Process(parsed)
 
 		// Update global state tracker (AFTER astTransformChildClasses)
-		for _, c := range parsed.Classes {
+		addKnownTypes(packageName, parsed)
-			KnownClassnames[c.ClassName] = lookupResultClass{packageName}
-		}
-		for _, td := range parsed.Typedefs {
-			KnownTypedefs[td.Alias] = lookupResultTypedef{packageName, td /* copy */}
-		}
-		for _, en := range parsed.Enums {
-			KnownEnums[en.EnumName] = lookupResultEnum{packageName, en /* copy */}
-		}
 
 		processHeaders = append(processHeaders, parsed)
 	}

cmd/genbindings/statetracker.go

@@ -0,0 +1,40 @@
+package main
+
+type lookupResultClass struct {
+	PackageName string
+	Class       *CppClass
+}
+
+type lookupResultTypedef struct {
+	PackageName string
+	Typedef     CppTypedef
+}
+
+type lookupResultEnum struct {
+	PackageName string
+	Enum        CppEnum
+}
+
+var (
+	KnownClassnames map[string]lookupResultClass // Entries of the form QFoo::Bar if it is an inner class
+	KnownTypedefs   map[string]lookupResultTypedef
+	KnownEnums      map[string]lookupResultEnum
+)
+
+func flushKnownTypes() {
+	KnownClassnames = make(map[string]lookupResultClass)
+	KnownTypedefs = make(map[string]lookupResultTypedef)
+	KnownEnums = make(map[string]lookupResultEnum)
+}
+
+func addKnownTypes(packageName string, parsed *CppParsedHeader) {
+	for i, c := range parsed.Classes {
+		KnownClassnames[c.ClassName] = lookupResultClass{packageName, &parsed.Classes[i] /* reference */}
+	}
+	for _, td := range parsed.Typedefs {
+		KnownTypedefs[td.Alias] = lookupResultTypedef{packageName, td /* copy */}
+	}
+	for _, en := range parsed.Enums {
+		KnownEnums[en.EnumName] = lookupResultEnum{packageName, en /* copy */}
+	}
+}

cmd/genbindings/transformblocklist.go

@@ -1,5 +1,20 @@
 package main
 
+func blocklist_MethodAllowed(m *CppMethod) bool {
+	if err := AllowType(m.ReturnType, true); err != nil {
+		return false
+	}
+
+	for _, p := range m.Parameters {
+		if err := AllowType(p, false); err != nil {
+			return false
+		}
+	}
+
+	// Nothing was blocked
+	return true
+}
+
 // astTransformBlocklist filters out methods using too-complex parameter types,
 // and entire classes that may be disallowed.
 func astTransformBlocklist(parsed *CppParsedHeader) {
@@ -28,16 +43,10 @@ func astTransformBlocklist(parsed *CppParsedHeader) {
 		j := 0
 	nextCtor:
 		for _, m := range c.Ctors {
-			if err := AllowType(m.ReturnType, true); err != nil {
+			if !blocklist_MethodAllowed(&m) {
 				continue nextCtor
 			}
 
-			for _, p := range m.Parameters {
-				if err := AllowType(p, false); err != nil {
-					continue nextCtor
-				}
-			}
-
 			// Keep
 			c.Ctors[j] = m
 			j++
@@ -49,16 +58,10 @@ func astTransformBlocklist(parsed *CppParsedHeader) {
 		j = 0
 	nextMethod:
 		for _, m := range c.Methods {
-			if err := AllowType(m.ReturnType, true); err != nil {
+			if !blocklist_MethodAllowed(&m) {
 				continue nextMethod
 			}
 
-			for _, p := range m.Parameters {
-				if err := AllowType(p, false); err != nil {
-					continue nextMethod
-				}
-			}
-
 			// Keep
 			c.Methods[j] = m
 			j++

cmd/genbindings/transformoptional.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"fmt"
+	"strconv"
 )
 
 // astTransformOptional expands all methods with optional parameters into
@@ -33,7 +33,7 @@ func astTransformOptional(parsed *CppParsedHeader) {
 			// Add method copies
 			for x := optionalStart; x < len(m.Parameters); x++ {
 				dupMethod := m // shallow copy
-				dupMethod.Rename(m.MethodName + fmt.Sprintf("%d", x+1))
+				dupMethod.Rename(m.MethodName + strconv.Itoa(x+1))
 				dupMethod.Parameters = m.Parameters[0 : x+1]
 				dupMethod.HiddenParams = m.Parameters[x+1:]
 

cmd/genbindings/transformtypedefs.go

@@ -29,17 +29,41 @@ func applyTypedefs(p CppParameter) CppParameter {
 			p.QtCppOriginalType = &tmp
 		}
 		p.ParameterType = p.ParameterType[0:bpos] + `<` + t2.RenderTypeQtCpp() + `>`
+
+	} else if kType, vType, ok := p.QMapOf(); ok {
+		kType2 := applyTypedefs(kType)
+		kType2.QtCppOriginalType = nil
+
+		vType2 := applyTypedefs(vType)
+		vType2.QtCppOriginalType = nil
+
+		bpos := strings.Index(p.ParameterType, `<`)
+
+		if p.QtCppOriginalType == nil {
+			tmp := p // copy
+			p.QtCppOriginalType = &tmp
+		}
+		p.ParameterType = p.ParameterType[0:bpos] + `<` + kType2.RenderTypeQtCpp() + `, ` + vType2.RenderTypeQtCpp() + `>`
+
+	} else if kType, vType, ok := p.QPairOf(); ok {
+		kType2 := applyTypedefs(kType)
+		kType2.QtCppOriginalType = nil
+
+		vType2 := applyTypedefs(vType)
+		vType2.QtCppOriginalType = nil
+
+		if p.QtCppOriginalType == nil {
+			tmp := p // copy
+			p.QtCppOriginalType = &tmp
+		}
+		p.ParameterType = `QPair<` + kType2.RenderTypeQtCpp() + `, ` + vType2.RenderTypeQtCpp() + `>`
+
 	}
 
 	return p
 }
 
-// astTransformTypedefs replaces the ParameterType with any known typedef value.
+func applyTypedefs_Method(m *CppMethod) {
-func astTransformTypedefs(parsed *CppParsedHeader) {
-
-	for i, c := range parsed.Classes {
-
-		for j, m := range c.Methods {
 
 	for k, p := range m.Parameters {
 		transformed := applyTypedefs(p)
@@ -56,21 +80,22 @@ func astTransformTypedefs(parsed *CppParsedHeader) {
 	if LinuxWindowsCompatCheck(m.ReturnType) {
 		m.LinuxOnly = true
 	}
+}
 
+// astTransformTypedefs replaces the ParameterType with any known typedef value.
+func astTransformTypedefs(parsed *CppParsedHeader) {
+
+	for i, c := range parsed.Classes {
+
+		for j, m := range c.Methods {
+
+			applyTypedefs_Method(&m)
 			c.Methods[j] = m
 		}
 
 		for j, m := range c.Ctors {
 
-			for k, p := range m.Parameters {
+			applyTypedefs_Method(&m)
-				transformed := applyTypedefs(p)
-				m.Parameters[k] = transformed
-
-				if LinuxWindowsCompatCheck(transformed) {
-					m.LinuxOnly = true
-				}
-			}
-
 			c.Ctors[j] = m
 		}
 		parsed.Classes[i] = c

cmd/genbindings/util.go

@@ -1,8 +1,8 @@
 package main
 
 import (
+	"strconv"
 	"encoding/json"
-	"fmt"
 	"log"
 	"strings"
 )
@@ -12,7 +12,7 @@ func maybeSuffix(counter int) string {
 		return ""
 	}
 
-	return fmt.Sprintf("%d", counter+1)
+	return strconv.Itoa(counter+1)
 }
 
 func titleCase(s string) string {

libmiqt/libmiqt.h

@@ -1,5 +1,6 @@
-#ifndef MIQT_BINDING_H
+#pragma once
-#define MIQT_BINDING_H
+#ifndef MIQT_LIBMIQT_LIBMIQT_H
+#define MIQT_LIBMIQT_LIBMIQT_H
 
 #include <string.h>
 #include <stdlib.h>

qt-extras/scintillaedit/gen_ScintillaEdit.cpp

@@ -1899,6 +1899,20 @@ struct miqt_string ScintillaEdit_TextReturner(const ScintillaEdit* self, int mes
 	return _ms;
 }
 
+struct miqt_map /* tuple of int and int */  ScintillaEdit_FindText(ScintillaEdit* self, int flags, const char* text, int cpMin, int cpMax) {
+	QPair<int, int> _ret = self->find_text(static_cast<int>(flags), text, static_cast<int>(cpMin), static_cast<int>(cpMax));
+	// Convert QPair<> from C++ memory to manually-managed C memory
+	int* _first_arr = static_cast<int*>(malloc(sizeof(int)));
+	int* _second_arr = static_cast<int*>(malloc(sizeof(int)));
+	_first_arr[0] = _ret.first;
+	_second_arr[0] = _ret.second;
+	struct miqt_map _out;
+	_out.len = 1;
+	_out.keys = static_cast<void*>(_first_arr);
+	_out.values = static_cast<void*>(_second_arr);
+	return _out;
+}
+
 struct miqt_string ScintillaEdit_GetTextRange(ScintillaEdit* self, int start, int end) {
 	QByteArray _qb = self->get_text_range(static_cast<int>(start), static_cast<int>(end));
 	struct miqt_string _ms;
@@ -1916,6 +1930,20 @@ void ScintillaEdit_SetDoc(ScintillaEdit* self, ScintillaDocument* pdoc_) {
 	self->set_doc(pdoc_);
 }
 
+struct miqt_map /* tuple of int and int */  ScintillaEdit_FindText2(ScintillaEdit* self, int flags, const char* text, int cpMin, int cpMax) {
+	QPair<int, int> _ret = self->findText(static_cast<int>(flags), text, static_cast<int>(cpMin), static_cast<int>(cpMax));
+	// Convert QPair<> from C++ memory to manually-managed C memory
+	int* _first_arr = static_cast<int*>(malloc(sizeof(int)));
+	int* _second_arr = static_cast<int*>(malloc(sizeof(int)));
+	_first_arr[0] = _ret.first;
+	_second_arr[0] = _ret.second;
+	struct miqt_map _out;
+	_out.len = 1;
+	_out.keys = static_cast<void*>(_first_arr);
+	_out.values = static_cast<void*>(_second_arr);
+	return _out;
+}
+
 struct miqt_string ScintillaEdit_TextRange(ScintillaEdit* self, int start, int end) {
 	QByteArray _qb = self->textRange(static_cast<int>(start), static_cast<int>(end));
 	struct miqt_string _ms;

qt-extras/scintillaedit/gen_ScintillaEdit.go

@@ -5831,6 +5831,25 @@ func (this *ScintillaEdit) TextReturner(message int, wParam uintptr) []byte {
 	return _ret
 }
 
+func (this *ScintillaEdit) FindText(flags int, text string, cpMin int, cpMax int) struct {
+	First  int
+	Second int
+} {
+	text_Cstring := C.CString(text)
+	defer C.free(unsafe.Pointer(text_Cstring))
+	var _mm C.struct_miqt_map = C.ScintillaEdit_FindText(this.h, (C.int)(flags), text_Cstring, (C.int)(cpMin), (C.int)(cpMax))
+	_First_CArray := (*[0xffff]C.int)(unsafe.Pointer(_mm.keys))
+	_Second_CArray := (*[0xffff]C.int)(unsafe.Pointer(_mm.values))
+	_entry_First := (int)(_First_CArray[0])
+
+	_entry_Second := (int)(_Second_CArray[0])
+
+	return struct {
+		First  int
+		Second int
+	}{First: _entry_First, Second: _entry_Second}
+}
+
 func (this *ScintillaEdit) GetTextRange(start int, end int) []byte {
 	var _bytearray C.struct_miqt_string = C.ScintillaEdit_GetTextRange(this.h, (C.int)(start), (C.int)(end))
 	_ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len)))
@@ -5846,6 +5865,25 @@ func (this *ScintillaEdit) SetDoc(pdoc_ *ScintillaDocument) {
 	C.ScintillaEdit_SetDoc(this.h, pdoc_.cPointer())
 }
 
+func (this *ScintillaEdit) FindText2(flags int, text string, cpMin int, cpMax int) struct {
+	First  int
+	Second int
+} {
+	text_Cstring := C.CString(text)
+	defer C.free(unsafe.Pointer(text_Cstring))
+	var _mm C.struct_miqt_map = C.ScintillaEdit_FindText2(this.h, (C.int)(flags), text_Cstring, (C.int)(cpMin), (C.int)(cpMax))
+	_First_CArray := (*[0xffff]C.int)(unsafe.Pointer(_mm.keys))
+	_Second_CArray := (*[0xffff]C.int)(unsafe.Pointer(_mm.values))
+	_entry_First := (int)(_First_CArray[0])
+
+	_entry_Second := (int)(_Second_CArray[0])
+
+	return struct {
+		First  int
+		Second int
+	}{First: _entry_First, Second: _entry_Second}
+}
+
 func (this *ScintillaEdit) TextRange(start int, end int) []byte {
 	var _bytearray C.struct_miqt_string = C.ScintillaEdit_TextRange(this.h, (C.int)(start), (C.int)(end))
 	_ret := C.GoBytes(unsafe.Pointer(_bytearray.data), C.int(int64(_bytearray.len)))

qt-extras/scintillaedit/gen_ScintillaEdit.h

@@ -1,5 +1,6 @@
-#ifndef GEN_SCINTILLAEDIT_H
+#pragma once
-#define GEN_SCINTILLAEDIT_H
+#ifndef MIQT_QT_EXTRAS_SCINTILLAEDIT_GEN_SCINTILLAEDIT_H
+#define MIQT_QT_EXTRAS_SCINTILLAEDIT_GEN_SCINTILLAEDIT_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -673,9 +674,11 @@ void* ScintillaEdit_Metacast(ScintillaEdit* self, const char* param1);
 struct miqt_string ScintillaEdit_Tr(const char* s);
 struct miqt_string ScintillaEdit_TrUtf8(const char* s);
 struct miqt_string ScintillaEdit_TextReturner(const ScintillaEdit* self, int message, uintptr_t wParam);
+struct miqt_map /* tuple of int and int */  ScintillaEdit_FindText(ScintillaEdit* self, int flags, const char* text, int cpMin, int cpMax);
 struct miqt_string ScintillaEdit_GetTextRange(ScintillaEdit* self, int start, int end);
 ScintillaDocument* ScintillaEdit_GetDoc(ScintillaEdit* self);
 void ScintillaEdit_SetDoc(ScintillaEdit* self, ScintillaDocument* pdoc_);
+struct miqt_map /* tuple of int and int */  ScintillaEdit_FindText2(ScintillaEdit* self, int flags, const char* text, int cpMin, int cpMax);
 struct miqt_string ScintillaEdit_TextRange(ScintillaEdit* self, int start, int end);
 long ScintillaEdit_FormatRange(ScintillaEdit* self, bool draw, QPaintDevice* target, QPaintDevice* measure, QRect* print_rect, QRect* page_rect, long range_start, long range_end);
 long ScintillaEdit_FormatRange2(ScintillaEdit* self, bool draw, QPaintDevice* target, QPaintDevice* measure, QRect* print_rect, QRect* page_rect, long range_start, long range_end);

qt-restricted-extras/qscintilla/gen_qsciabstractapis.cpp

@@ -64,7 +64,7 @@ void QsciAbstractAPIs_AutoCompletionSelected(QsciAbstractAPIs* self, struct miqt
 	self->autoCompletionSelected(selection_QString);
 }
 
-struct miqt_array QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts) {
+struct miqt_array /* of struct miqt_string */  QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts) {
 	QStringList context_QList;
 	context_QList.reserve(context.len);
 	struct miqt_string* context_arr = static_cast<struct miqt_string*>(context.data);

qt-restricted-extras/qscintilla/gen_qsciabstractapis.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIABSTRACTAPIS_H
+#pragma once
-#define GEN_QSCIABSTRACTAPIS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIABSTRACTAPIS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIABSTRACTAPIS_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -30,7 +31,7 @@ struct miqt_string QsciAbstractAPIs_TrUtf8(const char* s);
 QsciLexer* QsciAbstractAPIs_Lexer(const QsciAbstractAPIs* self);
 void QsciAbstractAPIs_UpdateAutoCompletionList(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */  context, struct miqt_array /* of struct miqt_string */  list);
 void QsciAbstractAPIs_AutoCompletionSelected(QsciAbstractAPIs* self, struct miqt_string selection);
-struct miqt_array QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts);
+struct miqt_array /* of struct miqt_string */  QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts);
 struct miqt_string QsciAbstractAPIs_Tr2(const char* s, const char* c);
 struct miqt_string QsciAbstractAPIs_Tr3(const char* s, const char* c, int n);
 struct miqt_string QsciAbstractAPIs_TrUtf82(const char* s, const char* c);

qt-restricted-extras/qscintilla/gen_qsciapis.cpp

@@ -115,7 +115,7 @@ void QsciAPIs_AutoCompletionSelected(QsciAPIs* self, struct miqt_string sel) {
 	self->autoCompletionSelected(sel_QString);
 }
 
-struct miqt_array QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts) {
+struct miqt_array /* of struct miqt_string */  QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts) {
 	QStringList context_QList;
 	context_QList.reserve(context.len);
 	struct miqt_string* context_arr = static_cast<struct miqt_string*>(context.data);
@@ -152,7 +152,7 @@ bool QsciAPIs_Event(QsciAPIs* self, QEvent* e) {
 	return self->event(e);
 }
 
-struct miqt_array QsciAPIs_InstalledAPIFiles(const QsciAPIs* self) {
+struct miqt_array /* of struct miqt_string */  QsciAPIs_InstalledAPIFiles(const QsciAPIs* self) {
 	QStringList _ret = self->installedAPIFiles();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qsciapis.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIAPIS_H
+#pragma once
-#define GEN_QSCIAPIS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIAPIS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIAPIS_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -42,9 +43,9 @@ bool QsciAPIs_LoadPrepared(QsciAPIs* self);
 bool QsciAPIs_SavePrepared(const QsciAPIs* self);
 void QsciAPIs_UpdateAutoCompletionList(QsciAPIs* self, struct miqt_array /* of struct miqt_string */  context, struct miqt_array /* of struct miqt_string */  list);
 void QsciAPIs_AutoCompletionSelected(QsciAPIs* self, struct miqt_string sel);
-struct miqt_array QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts);
+struct miqt_array /* of struct miqt_string */  QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts);
 bool QsciAPIs_Event(QsciAPIs* self, QEvent* e);
-struct miqt_array QsciAPIs_InstalledAPIFiles(const QsciAPIs* self);
+struct miqt_array /* of struct miqt_string */  QsciAPIs_InstalledAPIFiles(const QsciAPIs* self);
 void QsciAPIs_ApiPreparationCancelled(QsciAPIs* self);
 void QsciAPIs_connect_ApiPreparationCancelled(QsciAPIs* self, intptr_t slot);
 void QsciAPIs_ApiPreparationStarted(QsciAPIs* self);

qt-restricted-extras/qscintilla/gen_qscicommand.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCICOMMAND_H
+#pragma once
-#define GEN_QSCICOMMAND_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCICOMMAND_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCICOMMAND_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscicommandset.cpp

@@ -12,7 +12,7 @@ bool QsciCommandSet_WriteSettings(QsciCommandSet* self, QSettings* qs) {
 	return self->writeSettings(*qs);
 }
 
-struct miqt_array QsciCommandSet_Commands(QsciCommandSet* self) {
+struct miqt_array /* of QsciCommand* */  QsciCommandSet_Commands(QsciCommandSet* self) {
 	QList<QsciCommand *>& _ret = self->commands();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QsciCommand** _arr = static_cast<QsciCommand**>(malloc(sizeof(QsciCommand*) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscicommandset.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCICOMMANDSET_H
+#pragma once
-#define GEN_QSCICOMMANDSET_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCICOMMANDSET_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCICOMMANDSET_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -25,7 +26,7 @@ typedef struct QsciCommandSet QsciCommandSet;
 
 bool QsciCommandSet_ReadSettings(QsciCommandSet* self, QSettings* qs);
 bool QsciCommandSet_WriteSettings(QsciCommandSet* self, QSettings* qs);
-struct miqt_array QsciCommandSet_Commands(QsciCommandSet* self);
+struct miqt_array /* of QsciCommand* */  QsciCommandSet_Commands(QsciCommandSet* self);
 void QsciCommandSet_ClearKeys(QsciCommandSet* self);
 void QsciCommandSet_ClearAlternateKeys(QsciCommandSet* self);
 QsciCommand* QsciCommandSet_BoundTo(const QsciCommandSet* self, int key);

qt-restricted-extras/qscintilla/gen_qscidocument.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIDOCUMENT_H
+#pragma once
-#define GEN_QSCIDOCUMENT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIDOCUMENT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIDOCUMENT_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexer.cpp

@@ -60,7 +60,7 @@ const char* QsciLexer_AutoCompletionFillups(const QsciLexer* self) {
 	return (const char*) self->autoCompletionFillups();
 }
 
-struct miqt_array QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexer.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXER_H
+#pragma once
-#define GEN_QSCILEXER_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXER_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXER_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -40,7 +41,7 @@ const char* QsciLexer_Lexer(const QsciLexer* self);
 int QsciLexer_LexerId(const QsciLexer* self);
 QsciAbstractAPIs* QsciLexer_Apis(const QsciLexer* self);
 const char* QsciLexer_AutoCompletionFillups(const QsciLexer* self);
-struct miqt_array QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self);
+struct miqt_array /* of struct miqt_string */  QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self);
 int QsciLexer_AutoIndentStyle(QsciLexer* self);
 const char* QsciLexer_BlockEnd(const QsciLexer* self);
 int QsciLexer_BlockLookback(const QsciLexer* self);

qt-restricted-extras/qscintilla/gen_qscilexeravs.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERAVS_H
+#pragma once
-#define GEN_QSCILEXERAVS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERAVS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERAVS_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerbash.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERBASH_H
+#pragma once
-#define GEN_QSCILEXERBASH_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERBASH_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERBASH_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerbatch.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERBATCH_H
+#pragma once
-#define GEN_QSCILEXERBATCH_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERBATCH_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERBATCH_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexercmake.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCMAKE_H
+#pragma once
-#define GEN_QSCILEXERCMAKE_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCMAKE_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCMAKE_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.cpp

@@ -56,7 +56,7 @@ const char* QsciLexerCoffeeScript_Lexer(const QsciLexerCoffeeScript* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexercoffeescript.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCOFFEESCRIPT_H
+#pragma once
-#define GEN_QSCILEXERCOFFEESCRIPT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCOFFEESCRIPT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCOFFEESCRIPT_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -35,7 +36,7 @@ struct miqt_string QsciLexerCoffeeScript_Tr(const char* s);
 struct miqt_string QsciLexerCoffeeScript_TrUtf8(const char* s);
 const char* QsciLexerCoffeeScript_Language(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_Lexer(const QsciLexerCoffeeScript* self);
-struct miqt_array QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_BlockEnd(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_BlockStart(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_BlockStartKeyword(const QsciLexerCoffeeScript* self);

qt-restricted-extras/qscintilla/gen_qscilexercpp.cpp

@@ -60,7 +60,7 @@ const char* QsciLexerCPP_Lexer(const QsciLexerCPP* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexercpp.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCPP_H
+#pragma once
-#define GEN_QSCILEXERCPP_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCPP_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCPP_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -36,7 +37,7 @@ struct miqt_string QsciLexerCPP_Tr(const char* s);
 struct miqt_string QsciLexerCPP_TrUtf8(const char* s);
 const char* QsciLexerCPP_Language(const QsciLexerCPP* self);
 const char* QsciLexerCPP_Lexer(const QsciLexerCPP* self);
-struct miqt_array QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self);
 const char* QsciLexerCPP_BlockEnd(const QsciLexerCPP* self);
 const char* QsciLexerCPP_BlockStart(const QsciLexerCPP* self);
 const char* QsciLexerCPP_BlockStartKeyword(const QsciLexerCPP* self);

qt-restricted-extras/qscintilla/gen_qscilexercsharp.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCSHARP_H
+#pragma once
-#define GEN_QSCILEXERCSHARP_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCSHARP_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCSHARP_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexercss.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCSS_H
+#pragma once
-#define GEN_QSCILEXERCSS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCSS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCSS_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexercustom.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCUSTOM_H
+#pragma once
-#define GEN_QSCILEXERCUSTOM_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCUSTOM_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERCUSTOM_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerd.cpp

@@ -56,7 +56,7 @@ const char* QsciLexerD_Lexer(const QsciLexerD* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerD_AutoCompletionWordSeparators(const QsciLexerD* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerD_AutoCompletionWordSeparators(const QsciLexerD* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexerd.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERD_H
+#pragma once
-#define GEN_QSCILEXERD_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERD_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERD_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -35,7 +36,7 @@ struct miqt_string QsciLexerD_Tr(const char* s);
 struct miqt_string QsciLexerD_TrUtf8(const char* s);
 const char* QsciLexerD_Language(const QsciLexerD* self);
 const char* QsciLexerD_Lexer(const QsciLexerD* self);
-struct miqt_array QsciLexerD_AutoCompletionWordSeparators(const QsciLexerD* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerD_AutoCompletionWordSeparators(const QsciLexerD* self);
 const char* QsciLexerD_BlockEnd(const QsciLexerD* self);
 const char* QsciLexerD_BlockStart(const QsciLexerD* self);
 const char* QsciLexerD_BlockStartKeyword(const QsciLexerD* self);

qt-restricted-extras/qscintilla/gen_qscilexerdiff.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERDIFF_H
+#pragma once
-#define GEN_QSCILEXERDIFF_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERDIFF_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERDIFF_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexeredifact.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXEREDIFACT_H
+#pragma once
-#define GEN_QSCILEXEREDIFACT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXEREDIFACT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXEREDIFACT_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerfortran.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERFORTRAN_H
+#pragma once
-#define GEN_QSCILEXERFORTRAN_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERFORTRAN_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERFORTRAN_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerfortran77.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERFORTRAN77_H
+#pragma once
-#define GEN_QSCILEXERFORTRAN77_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERFORTRAN77_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERFORTRAN77_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerhtml.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERHTML_H
+#pragma once
-#define GEN_QSCILEXERHTML_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERHTML_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERHTML_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexeridl.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERIDL_H
+#pragma once
-#define GEN_QSCILEXERIDL_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERIDL_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERIDL_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerjava.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERJAVA_H
+#pragma once
-#define GEN_QSCILEXERJAVA_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERJAVA_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERJAVA_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerjavascript.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERJAVASCRIPT_H
+#pragma once
-#define GEN_QSCILEXERJAVASCRIPT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERJAVASCRIPT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERJAVASCRIPT_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerjson.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERJSON_H
+#pragma once
-#define GEN_QSCILEXERJSON_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERJSON_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERJSON_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerlua.cpp

@@ -56,7 +56,7 @@ const char* QsciLexerLua_Lexer(const QsciLexerLua* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerLua_AutoCompletionWordSeparators(const QsciLexerLua* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerLua_AutoCompletionWordSeparators(const QsciLexerLua* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexerlua.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERLUA_H
+#pragma once
-#define GEN_QSCILEXERLUA_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERLUA_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERLUA_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -35,7 +36,7 @@ struct miqt_string QsciLexerLua_Tr(const char* s);
 struct miqt_string QsciLexerLua_TrUtf8(const char* s);
 const char* QsciLexerLua_Language(const QsciLexerLua* self);
 const char* QsciLexerLua_Lexer(const QsciLexerLua* self);
-struct miqt_array QsciLexerLua_AutoCompletionWordSeparators(const QsciLexerLua* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerLua_AutoCompletionWordSeparators(const QsciLexerLua* self);
 const char* QsciLexerLua_BlockStart(const QsciLexerLua* self);
 int QsciLexerLua_BraceStyle(const QsciLexerLua* self);
 QColor* QsciLexerLua_DefaultColor(const QsciLexerLua* self, int style);

qt-restricted-extras/qscintilla/gen_qscilexermakefile.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERMAKEFILE_H
+#pragma once
-#define GEN_QSCILEXERMAKEFILE_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERMAKEFILE_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERMAKEFILE_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexermarkdown.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERMARKDOWN_H
+#pragma once
-#define GEN_QSCILEXERMARKDOWN_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERMARKDOWN_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERMARKDOWN_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexermatlab.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERMATLAB_H
+#pragma once
-#define GEN_QSCILEXERMATLAB_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERMATLAB_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERMATLAB_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexeroctave.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXEROCTAVE_H
+#pragma once
-#define GEN_QSCILEXEROCTAVE_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXEROCTAVE_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXEROCTAVE_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerpascal.cpp

@@ -56,7 +56,7 @@ const char* QsciLexerPascal_Lexer(const QsciLexerPascal* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerPascal_AutoCompletionWordSeparators(const QsciLexerPascal* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerPascal_AutoCompletionWordSeparators(const QsciLexerPascal* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexerpascal.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERPASCAL_H
+#pragma once
-#define GEN_QSCILEXERPASCAL_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPASCAL_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPASCAL_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -35,7 +36,7 @@ struct miqt_string QsciLexerPascal_Tr(const char* s);
 struct miqt_string QsciLexerPascal_TrUtf8(const char* s);
 const char* QsciLexerPascal_Language(const QsciLexerPascal* self);
 const char* QsciLexerPascal_Lexer(const QsciLexerPascal* self);
-struct miqt_array QsciLexerPascal_AutoCompletionWordSeparators(const QsciLexerPascal* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerPascal_AutoCompletionWordSeparators(const QsciLexerPascal* self);
 const char* QsciLexerPascal_BlockEnd(const QsciLexerPascal* self);
 const char* QsciLexerPascal_BlockStart(const QsciLexerPascal* self);
 const char* QsciLexerPascal_BlockStartKeyword(const QsciLexerPascal* self);

qt-restricted-extras/qscintilla/gen_qscilexerperl.cpp

@@ -56,7 +56,7 @@ const char* QsciLexerPerl_Lexer(const QsciLexerPerl* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerPerl_AutoCompletionWordSeparators(const QsciLexerPerl* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerPerl_AutoCompletionWordSeparators(const QsciLexerPerl* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexerperl.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERPERL_H
+#pragma once
-#define GEN_QSCILEXERPERL_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPERL_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPERL_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -35,7 +36,7 @@ struct miqt_string QsciLexerPerl_Tr(const char* s);
 struct miqt_string QsciLexerPerl_TrUtf8(const char* s);
 const char* QsciLexerPerl_Language(const QsciLexerPerl* self);
 const char* QsciLexerPerl_Lexer(const QsciLexerPerl* self);
-struct miqt_array QsciLexerPerl_AutoCompletionWordSeparators(const QsciLexerPerl* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerPerl_AutoCompletionWordSeparators(const QsciLexerPerl* self);
 const char* QsciLexerPerl_BlockEnd(const QsciLexerPerl* self);
 const char* QsciLexerPerl_BlockStart(const QsciLexerPerl* self);
 int QsciLexerPerl_BraceStyle(const QsciLexerPerl* self);

qt-restricted-extras/qscintilla/gen_qscilexerpo.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERPO_H
+#pragma once
-#define GEN_QSCILEXERPO_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPO_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPO_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerpostscript.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERPOSTSCRIPT_H
+#pragma once
-#define GEN_QSCILEXERPOSTSCRIPT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPOSTSCRIPT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPOSTSCRIPT_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerpov.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERPOV_H
+#pragma once
-#define GEN_QSCILEXERPOV_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPOV_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPOV_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerproperties.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERPROPERTIES_H
+#pragma once
-#define GEN_QSCILEXERPROPERTIES_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPROPERTIES_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPROPERTIES_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerpython.cpp

@@ -56,7 +56,7 @@ const char* QsciLexerPython_Lexer(const QsciLexerPython* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerPython_AutoCompletionWordSeparators(const QsciLexerPython* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerPython_AutoCompletionWordSeparators(const QsciLexerPython* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qscilexerpython.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERPYTHON_H
+#pragma once
-#define GEN_QSCILEXERPYTHON_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPYTHON_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERPYTHON_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -35,7 +36,7 @@ struct miqt_string QsciLexerPython_Tr(const char* s);
 struct miqt_string QsciLexerPython_TrUtf8(const char* s);
 const char* QsciLexerPython_Language(const QsciLexerPython* self);
 const char* QsciLexerPython_Lexer(const QsciLexerPython* self);
-struct miqt_array QsciLexerPython_AutoCompletionWordSeparators(const QsciLexerPython* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerPython_AutoCompletionWordSeparators(const QsciLexerPython* self);
 int QsciLexerPython_BlockLookback(const QsciLexerPython* self);
 const char* QsciLexerPython_BlockStart(const QsciLexerPython* self);
 int QsciLexerPython_BraceStyle(const QsciLexerPython* self);

qt-restricted-extras/qscintilla/gen_qscilexerruby.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERRUBY_H
+#pragma once
-#define GEN_QSCILEXERRUBY_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERRUBY_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERRUBY_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerspice.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERSPICE_H
+#pragma once
-#define GEN_QSCILEXERSPICE_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERSPICE_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERSPICE_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexersql.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERSQL_H
+#pragma once
-#define GEN_QSCILEXERSQL_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERSQL_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERSQL_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexertcl.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERTCL_H
+#pragma once
-#define GEN_QSCILEXERTCL_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERTCL_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERTCL_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexertex.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERTEX_H
+#pragma once
-#define GEN_QSCILEXERTEX_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERTEX_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERTEX_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerverilog.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERVERILOG_H
+#pragma once
-#define GEN_QSCILEXERVERILOG_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERVERILOG_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERVERILOG_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexervhdl.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERVHDL_H
+#pragma once
-#define GEN_QSCILEXERVHDL_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERVHDL_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERVHDL_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexerxml.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERXML_H
+#pragma once
-#define GEN_QSCILEXERXML_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERXML_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERXML_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscilexeryaml.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERYAML_H
+#pragma once
-#define GEN_QSCILEXERYAML_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERYAML_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCILEXERYAML_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscimacro.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIMACRO_H
+#pragma once
-#define GEN_QSCIMACRO_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIMACRO_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIMACRO_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qsciprinter.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIPRINTER_H
+#pragma once
-#define GEN_QSCIPRINTER_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIPRINTER_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCIPRINTER_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qsciscintilla.cpp

@@ -54,7 +54,7 @@ struct miqt_string QsciScintilla_TrUtf8(const char* s) {
 	return _ms;
 }
 
-struct miqt_array QsciScintilla_ApiContext(QsciScintilla* self, int pos, int* context_start, int* last_word_start) {
+struct miqt_array /* of struct miqt_string */  QsciScintilla_ApiContext(QsciScintilla* self, int pos, int* context_start, int* last_word_start) {
 	QStringList _ret = self->apiContext(static_cast<int>(pos), static_cast<int&>(*context_start), static_cast<int&>(*last_word_start));
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));
@@ -206,7 +206,7 @@ QColor* QsciScintilla_Color(const QsciScintilla* self) {
 	return new QColor(self->color());
 }
 
-struct miqt_array QsciScintilla_ContractedFolds(const QsciScintilla* self) {
+struct miqt_array /* of int */  QsciScintilla_ContractedFolds(const QsciScintilla* self) {
 	QList<int> _ret = self->contractedFolds();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	int* _arr = static_cast<int*>(malloc(sizeof(int) * _ret.length()));

qt-restricted-extras/qscintilla/gen_qsciscintilla.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCISCINTILLA_H
+#pragma once
-#define GEN_QSCISCINTILLA_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISCINTILLA_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISCINTILLA_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -55,7 +56,7 @@ QMetaObject* QsciScintilla_MetaObject(const QsciScintilla* self);
 void* QsciScintilla_Metacast(QsciScintilla* self, const char* param1);
 struct miqt_string QsciScintilla_Tr(const char* s);
 struct miqt_string QsciScintilla_TrUtf8(const char* s);
-struct miqt_array QsciScintilla_ApiContext(QsciScintilla* self, int pos, int* context_start, int* last_word_start);
+struct miqt_array /* of struct miqt_string */  QsciScintilla_ApiContext(QsciScintilla* self, int pos, int* context_start, int* last_word_start);
 void QsciScintilla_Annotate(QsciScintilla* self, int line, struct miqt_string text, int style);
 void QsciScintilla_Annotate2(QsciScintilla* self, int line, struct miqt_string text, QsciStyle* style);
 void QsciScintilla_Annotate3(QsciScintilla* self, int line, QsciStyledText* text);
@@ -84,7 +85,7 @@ void QsciScintilla_ClearFolds(QsciScintilla* self);
 void QsciScintilla_ClearIndicatorRange(QsciScintilla* self, int lineFrom, int indexFrom, int lineTo, int indexTo, int indicatorNumber);
 void QsciScintilla_ClearRegisteredImages(QsciScintilla* self);
 QColor* QsciScintilla_Color(const QsciScintilla* self);
-struct miqt_array QsciScintilla_ContractedFolds(const QsciScintilla* self);
+struct miqt_array /* of int */  QsciScintilla_ContractedFolds(const QsciScintilla* self);
 void QsciScintilla_ConvertEols(QsciScintilla* self, int mode);
 QMenu* QsciScintilla_CreateStandardContextMenu(QsciScintilla* self);
 QsciDocument* QsciScintilla_Document(const QsciScintilla* self);

qt-restricted-extras/qscintilla/gen_qsciscintillabase.go

@@ -1783,7 +1783,7 @@ func (this *QsciScintillaBase) OnSCN_MACRORECORD(slot func(param1 uint, param2 u
 }
 
 //export miqt_exec_callback_QsciScintillaBase_SCN_MACRORECORD
-func miqt_exec_callback_QsciScintillaBase_SCN_MACRORECORD(cb C.intptr_t, param1 C.uint, param2 C.ulong, param3 *C.void) {
+func miqt_exec_callback_QsciScintillaBase_SCN_MACRORECORD(cb C.intptr_t, param1 C.uint, param2 C.ulong, param3 unsafe.Pointer) {
 	gofunc, ok := cgo.Handle(cb).Value().(func(param1 uint, param2 uint64, param3 unsafe.Pointer))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")

qt-restricted-extras/qscintilla/gen_qsciscintillabase.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCISCINTILLABASE_H
+#pragma once
-#define GEN_QSCISCINTILLABASE_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISCINTILLABASE_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISCINTILLABASE_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscistyle.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCISTYLE_H
+#pragma once
-#define GEN_QSCISTYLE_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISTYLE_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISTYLE_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla/gen_qscistyledtext.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCISTYLEDTEXT_H
+#pragma once
-#define GEN_QSCISTYLEDTEXT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISTYLEDTEXT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA_GEN_QSCISTYLEDTEXT_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qsciabstractapis.cpp

@@ -53,7 +53,7 @@ void QsciAbstractAPIs_AutoCompletionSelected(QsciAbstractAPIs* self, struct miqt
 	self->autoCompletionSelected(selection_QString);
 }
 
-struct miqt_array QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts) {
+struct miqt_array /* of struct miqt_string */  QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts) {
 	QStringList context_QList;
 	context_QList.reserve(context.len);
 	struct miqt_string* context_arr = static_cast<struct miqt_string*>(context.data);

qt-restricted-extras/qscintilla6/gen_qsciabstractapis.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIABSTRACTAPIS_H
+#pragma once
-#define GEN_QSCIABSTRACTAPIS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCIABSTRACTAPIS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCIABSTRACTAPIS_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -29,7 +30,7 @@ struct miqt_string QsciAbstractAPIs_Tr(const char* s);
 QsciLexer* QsciAbstractAPIs_Lexer(const QsciAbstractAPIs* self);
 void QsciAbstractAPIs_UpdateAutoCompletionList(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */  context, struct miqt_array /* of struct miqt_string */  list);
 void QsciAbstractAPIs_AutoCompletionSelected(QsciAbstractAPIs* self, struct miqt_string selection);
-struct miqt_array QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts);
+struct miqt_array /* of struct miqt_string */  QsciAbstractAPIs_CallTips(QsciAbstractAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts);
 struct miqt_string QsciAbstractAPIs_Tr2(const char* s, const char* c);
 struct miqt_string QsciAbstractAPIs_Tr3(const char* s, const char* c, int n);
 void QsciAbstractAPIs_Delete(QsciAbstractAPIs* self);

qt-restricted-extras/qscintilla6/gen_qsciapis.cpp

@@ -104,7 +104,7 @@ void QsciAPIs_AutoCompletionSelected(QsciAPIs* self, struct miqt_string sel) {
 	self->autoCompletionSelected(sel_QString);
 }
 
-struct miqt_array QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts) {
+struct miqt_array /* of struct miqt_string */  QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts) {
 	QStringList context_QList;
 	context_QList.reserve(context.len);
 	struct miqt_string* context_arr = static_cast<struct miqt_string*>(context.data);
@@ -141,7 +141,7 @@ bool QsciAPIs_Event(QsciAPIs* self, QEvent* e) {
 	return self->event(e);
 }
 
-struct miqt_array QsciAPIs_InstalledAPIFiles(const QsciAPIs* self) {
+struct miqt_array /* of struct miqt_string */  QsciAPIs_InstalledAPIFiles(const QsciAPIs* self) {
 	QStringList _ret = self->installedAPIFiles();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla6/gen_qsciapis.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIAPIS_H
+#pragma once
-#define GEN_QSCIAPIS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCIAPIS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCIAPIS_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -41,9 +42,9 @@ bool QsciAPIs_LoadPrepared(QsciAPIs* self);
 bool QsciAPIs_SavePrepared(const QsciAPIs* self);
 void QsciAPIs_UpdateAutoCompletionList(QsciAPIs* self, struct miqt_array /* of struct miqt_string */  context, struct miqt_array /* of struct miqt_string */  list);
 void QsciAPIs_AutoCompletionSelected(QsciAPIs* self, struct miqt_string sel);
-struct miqt_array QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */ context, int commas, int style, struct miqt_array /* of int */ shifts);
+struct miqt_array /* of struct miqt_string */  QsciAPIs_CallTips(QsciAPIs* self, struct miqt_array /* of struct miqt_string */  context, int commas, int style, struct miqt_array /* of int */  shifts);
 bool QsciAPIs_Event(QsciAPIs* self, QEvent* e);
-struct miqt_array QsciAPIs_InstalledAPIFiles(const QsciAPIs* self);
+struct miqt_array /* of struct miqt_string */  QsciAPIs_InstalledAPIFiles(const QsciAPIs* self);
 void QsciAPIs_ApiPreparationCancelled(QsciAPIs* self);
 void QsciAPIs_connect_ApiPreparationCancelled(QsciAPIs* self, intptr_t slot);
 void QsciAPIs_ApiPreparationStarted(QsciAPIs* self);

qt-restricted-extras/qscintilla6/gen_qscicommand.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCICOMMAND_H
+#pragma once
-#define GEN_QSCICOMMAND_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCICOMMAND_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCICOMMAND_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qscicommandset.cpp

@@ -12,7 +12,7 @@ bool QsciCommandSet_WriteSettings(QsciCommandSet* self, QSettings* qs) {
 	return self->writeSettings(*qs);
 }
 
-struct miqt_array QsciCommandSet_Commands(QsciCommandSet* self) {
+struct miqt_array /* of QsciCommand* */  QsciCommandSet_Commands(QsciCommandSet* self) {
 	QList<QsciCommand *>& _ret = self->commands();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QsciCommand** _arr = static_cast<QsciCommand**>(malloc(sizeof(QsciCommand*) * _ret.length()));

qt-restricted-extras/qscintilla6/gen_qscicommandset.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCICOMMANDSET_H
+#pragma once
-#define GEN_QSCICOMMANDSET_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCICOMMANDSET_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCICOMMANDSET_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -25,7 +26,7 @@ typedef struct QsciCommandSet QsciCommandSet;
 
 bool QsciCommandSet_ReadSettings(QsciCommandSet* self, QSettings* qs);
 bool QsciCommandSet_WriteSettings(QsciCommandSet* self, QSettings* qs);
-struct miqt_array QsciCommandSet_Commands(QsciCommandSet* self);
+struct miqt_array /* of QsciCommand* */  QsciCommandSet_Commands(QsciCommandSet* self);
 void QsciCommandSet_ClearKeys(QsciCommandSet* self);
 void QsciCommandSet_ClearAlternateKeys(QsciCommandSet* self);
 QsciCommand* QsciCommandSet_BoundTo(const QsciCommandSet* self, int key);

qt-restricted-extras/qscintilla6/gen_qscidocument.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCIDOCUMENT_H
+#pragma once
-#define GEN_QSCIDOCUMENT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCIDOCUMENT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCIDOCUMENT_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qscilexer.cpp

@@ -49,7 +49,7 @@ const char* QsciLexer_AutoCompletionFillups(const QsciLexer* self) {
 	return (const char*) self->autoCompletionFillups();
 }
 
-struct miqt_array QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla6/gen_qscilexer.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXER_H
+#pragma once
-#define GEN_QSCILEXER_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXER_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXER_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -39,7 +40,7 @@ const char* QsciLexer_Lexer(const QsciLexer* self);
 int QsciLexer_LexerId(const QsciLexer* self);
 QsciAbstractAPIs* QsciLexer_Apis(const QsciLexer* self);
 const char* QsciLexer_AutoCompletionFillups(const QsciLexer* self);
-struct miqt_array QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self);
+struct miqt_array /* of struct miqt_string */  QsciLexer_AutoCompletionWordSeparators(const QsciLexer* self);
 int QsciLexer_AutoIndentStyle(QsciLexer* self);
 const char* QsciLexer_BlockEnd(const QsciLexer* self);
 int QsciLexer_BlockLookback(const QsciLexer* self);

qt-restricted-extras/qscintilla6/gen_qscilexeravs.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERAVS_H
+#pragma once
-#define GEN_QSCILEXERAVS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERAVS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERAVS_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qscilexerbash.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERBASH_H
+#pragma once
-#define GEN_QSCILEXERBASH_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERBASH_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERBASH_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qscilexerbatch.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERBATCH_H
+#pragma once
-#define GEN_QSCILEXERBATCH_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERBATCH_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERBATCH_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qscilexercmake.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCMAKE_H
+#pragma once
-#define GEN_QSCILEXERCMAKE_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCMAKE_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCMAKE_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.cpp

@@ -45,7 +45,7 @@ const char* QsciLexerCoffeeScript_Lexer(const QsciLexerCoffeeScript* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla6/gen_qscilexercoffeescript.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCOFFEESCRIPT_H
+#pragma once
-#define GEN_QSCILEXERCOFFEESCRIPT_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCOFFEESCRIPT_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCOFFEESCRIPT_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -34,7 +35,7 @@ void* QsciLexerCoffeeScript_Metacast(QsciLexerCoffeeScript* self, const char* pa
 struct miqt_string QsciLexerCoffeeScript_Tr(const char* s);
 const char* QsciLexerCoffeeScript_Language(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_Lexer(const QsciLexerCoffeeScript* self);
-struct miqt_array QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerCoffeeScript_AutoCompletionWordSeparators(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_BlockEnd(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_BlockStart(const QsciLexerCoffeeScript* self);
 const char* QsciLexerCoffeeScript_BlockStartKeyword(const QsciLexerCoffeeScript* self);

qt-restricted-extras/qscintilla6/gen_qscilexercpp.cpp

@@ -49,7 +49,7 @@ const char* QsciLexerCPP_Lexer(const QsciLexerCPP* self) {
 	return (const char*) self->lexer();
 }
 
-struct miqt_array QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self) {
+struct miqt_array /* of struct miqt_string */  QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self) {
 	QStringList _ret = self->autoCompletionWordSeparators();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	struct miqt_string* _arr = static_cast<struct miqt_string*>(malloc(sizeof(struct miqt_string) * _ret.length()));

qt-restricted-extras/qscintilla6/gen_qscilexercpp.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCPP_H
+#pragma once
-#define GEN_QSCILEXERCPP_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCPP_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCPP_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -35,7 +36,7 @@ void* QsciLexerCPP_Metacast(QsciLexerCPP* self, const char* param1);
 struct miqt_string QsciLexerCPP_Tr(const char* s);
 const char* QsciLexerCPP_Language(const QsciLexerCPP* self);
 const char* QsciLexerCPP_Lexer(const QsciLexerCPP* self);
-struct miqt_array QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self);
+struct miqt_array /* of struct miqt_string */  QsciLexerCPP_AutoCompletionWordSeparators(const QsciLexerCPP* self);
 const char* QsciLexerCPP_BlockEnd(const QsciLexerCPP* self);
 const char* QsciLexerCPP_BlockStart(const QsciLexerCPP* self);
 const char* QsciLexerCPP_BlockStartKeyword(const QsciLexerCPP* self);

qt-restricted-extras/qscintilla6/gen_qscilexercsharp.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCSHARP_H
+#pragma once
-#define GEN_QSCILEXERCSHARP_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCSHARP_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCSHARP_H
 
 #include <stdbool.h>
 #include <stddef.h>

qt-restricted-extras/qscintilla6/gen_qscilexercss.h

@@ -1,5 +1,6 @@
-#ifndef GEN_QSCILEXERCSS_H
+#pragma once
-#define GEN_QSCILEXERCSS_H
+#ifndef MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCSS_H
+#define MIQT_QT_RESTRICTED_EXTRAS_QSCINTILLA6_GEN_QSCILEXERCSS_H
 
 #include <stdbool.h>
 #include <stddef.h>